Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter

# Conflicts:
#	resources/i18n/cs_CZ/fdmprinter.def.json.po
#	resources/i18n/de_DE/fdmprinter.def.json.po
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fdmprinter.def.json.pot
#	resources/i18n/fi_FI/fdmprinter.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/hu_HU/fdmprinter.def.json.po
#	resources/i18n/it_IT/fdmprinter.def.json.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/fdmprinter.def.json.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/pl_PL/fdmprinter.def.json.po
#	resources/i18n/pt_BR/fdmprinter.def.json.po
#	resources/i18n/pt_PT/fdmprinter.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
#	resources/i18n/tr_TR/fdmprinter.def.json.po
#	resources/i18n/zh_CN/fdmprinter.def.json.po
#	resources/i18n/zh_TW/fdmprinter.def.json.po
This commit is contained in:
c.lamboo 2023-03-15 12:50:29 +01:00
commit 61aff1756e
23 changed files with 250 additions and 64 deletions

View file

@ -46,7 +46,7 @@ class PauseAtHeight(Script):
"pause_layer":
{
"label": "Pause Layer",
"description": "Enter the Number of the LAST layer you want to finish prior to the pause (from the Cura preview).",
"description": "Enter the Number of the LAST layer you want to finish prior to the pause. Note that 0 is the first layer printed.",
"type": "int",
"value": "math.floor((pause_height - 0.27) / 0.1) + 1",
"minimum_value": "0",

View file

@ -4407,9 +4407,9 @@
"unit": "mm/s",
"type": "float",
"default_value": 10,
"enabled": "cool_min_layer_time > 0",
"minimum_value": "0",
"minimum_value": "1",
"maximum_value_warning": "100",
"enabled": "cool_min_layer_time > 0",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -5691,6 +5691,21 @@
"settable_per_mesh": false,
"settable_per_extruder": true
},
"skirt_height":
{
"label": "Skirt Height",
"description": "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt.",
"type": "int",
"default_value": 3,
"value": "3 if resolveOrValue('skirt_gap') > 0.0 else 1",
"minimum_value": "1",
"maximum_value_warning": "10",
"maximum_value": "machine_height / layer_height",
"enabled": "resolveOrValue('adhesion_type') == 'skirt'",
"limit_to_extruder": "skirt_brim_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true
},
"skirt_gap":
{
"label": "Skirt Distance",

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Cura 5.1\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: 2023-02-16 20:35+0100\n"
"Last-Translator: Miroslav Šustek <sustmidown@centrum.cz>\n"
"Language-Team: DenyCZ <www.github.com/DenyCZ>\n"
@ -3186,6 +3186,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "Teplota při tisku první vrstvy"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3671,6 +3676,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Vzdálenost okraj"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
@ -3183,6 +3183,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "Drucktemperatur erste Schicht"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3668,6 +3673,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Skirt-Abstand"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
@ -3183,6 +3183,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "Temperatura de impresión de la capa inicial"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3668,6 +3673,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Distancia de falda"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
@ -4706,6 +4706,16 @@ msgctxt "skirt_line_count description"
msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_gap label"
msgid "Skirt Distance"

View file

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Cura 5.1\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: 2022-07-15 11:17+0200\n"
"Last-Translator: Bothof <info@bothof.nl>\n"
"Language-Team: Finnish\n"
@ -3181,6 +3181,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "Alkukerroksen tulostuslämpötila"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3666,6 +3671,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Helman etäisyys"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -3183,6 +3183,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "Température dimpression couche initiale"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3668,6 +3673,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Distance de la jupe"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Cura 5.1\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: 2020-03-24 09:43+0100\n"
"Last-Translator: Nagy Attila <vokroot@gmail.com>\n"
"Language-Team: AT-VLOG\n"
@ -3186,6 +3186,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "Kezdő réteg nyomtatási hőmérséklete"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3671,6 +3676,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Szoknya távolság"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
@ -3183,6 +3183,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "Temperatura di stampa Strato iniziale"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3668,6 +3673,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Distanza dello skirt"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
@ -3183,6 +3183,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "初期レイヤー印刷温度"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3668,6 +3673,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "スカート距離"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
@ -3181,6 +3181,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "첫번째 레이어의 프린팅 온도"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3666,6 +3671,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "스커트 거리"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
@ -3183,6 +3183,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "Printtemperatuur van de eerste laag"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3668,6 +3673,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Skirtafstand"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -3187,6 +3187,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "Temp. Druku Początk. Warstwy"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3672,6 +3677,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Odległ. Obwódki"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Cura 5.0\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: 2023-02-17 16:31+0100\n"
"Last-Translator: Cláudio Sampaio <patola@gmail.com>\n"
"Language-Team: Cláudio Sampaio <patola@gmail.com>\n"
@ -3188,6 +3188,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "Temperatura de Impressão da Camada Inicial"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3673,6 +3678,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Distância do Skirt"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
@ -3183,6 +3183,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "Temperatura Impressão Camada Inicial"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3668,6 +3673,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Distância Contorno"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
@ -3183,6 +3183,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "Температура печати первого слоя"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3668,6 +3673,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Дистанция до юбки"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
@ -3183,6 +3183,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "İlk Katman Yazdırma Sıcaklığı"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3668,6 +3673,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Etek Mesafesi"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -3183,6 +3183,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "打印温度起始层"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3668,6 +3673,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "Skirt 距离"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Cura 5.1\n"
"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
"POT-Creation-Date: 2023-03-15 10:57+0000\n"
"POT-Creation-Date: 2023-03-14 17:27+0000\n"
"PO-Revision-Date: 2022-01-02 20:24+0800\n"
"Last-Translator: Valen Chang <carf17771@gmail.com>\n"
"Language-Team: Valen Chang <carf17771@gmail.com>\n"
@ -3188,6 +3188,11 @@ msgctxt "material_print_temperature_layer_0 label"
msgid "Printing Temperature Initial Layer"
msgstr "列印溫度起始層"
#: fdmprinter.def.json
msgctxt "skirt_height description"
msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt."
msgstr ""
#: fdmprinter.def.json
msgctxt "alternate_extra_perimeter description"
msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints."
@ -3673,6 +3678,11 @@ msgctxt "skirt_gap label"
msgid "Skirt Distance"
msgstr "外圍間距"
#: fdmprinter.def.json
msgctxt "skirt_height label"
msgid "Skirt Height"
msgstr ""
#: fdmprinter.def.json
msgctxt "skirt_line_count label"
msgid "Skirt Line Count"

View file

@ -65,32 +65,30 @@ UM.TooltipArea
{
id: defaultOptionsModel
function updateModel()
{
clear()
function updateModel() {
clear();
if(!propertyProvider.properties.options)
{
return
if (!propertyProvider.properties.options) {
return;
}
if (typeof propertyProvider.properties["options"] === "string")
{
return
if (typeof propertyProvider.properties["options"] === "string") {
return;
}
let currentIndex = -1;
const keys = propertyProvider.properties["options"].keys();
for (let index = 0; index < propertyProvider.properties["options"].keys().length; index ++) {
const key = propertyProvider.properties["options"].keys()[index];
const value = propertyProvider.properties["options"][key];
for (var i = 0; i < propertyProvider.properties["options"].keys().length; i++)
{
var key = propertyProvider.properties["options"].keys()[i]
var value = propertyProvider.properties["options"][key]
append({ text: value, code: key })
if (propertyProvider.properties.value === key) {
currentIndex = index;
}
defaultOptionsModel.append({ text: value, value: key });
}
if (propertyProvider.properties.value === key)
{
comboBox.currentIndex = i
}
}
comboBox.currentIndex = currentIndex;
}
Component.onCompleted: updateModel()
@ -114,36 +112,28 @@ UM.TooltipArea
model: defaultOptionsModel
textRole: "text"
currentIndex:
{
var currentValue = propertyProvider.properties.value
var index = 0
for (var i = 0; i < model.count; i++)
{
if (model.get(i).value == currentValue)
{
index = i
break
currentIndex: function () {
const currentValue = propertyProvider.properties.value
for (let i = 0; i < model.count; i ++) {
if (model.get(i).value === currentValue) {
return i;
}
}
return index
return -1;
}
onActivated:
{
var newValue = model.get(index).value
if (propertyProvider.properties.value !== newValue && newValue !== undefined)
{
if (setValueFunction !== null)
{
setValueFunction(newValue)
onActivated: function (index) {
const key = propertyProvider.properties["options"].keys()[index];
const newValue = model.get(index).value;
if (propertyProvider.properties.value !== newValue && newValue !== undefined) {
if (setValueFunction !== null) {
setValueFunction(newValue);
} else {
propertyProvider.setPropertyValue("value", newValue);
}
else
{
propertyProvider.setPropertyValue("value", newValue)
}
forceUpdateOnChangeFunction()
afterOnEditingFinishedFunction()
forceUpdateOnChangeFunction();
afterOnEditingFinishedFunction();
}
}
}

View file

@ -32,7 +32,7 @@ Item
UM.Label
{
id: bedTargetTemperature
text: printerModel != null ? printerModel.targetBedTemperature + "°C" : ""
text: printerModel != null ? Math.round(printerModel.targetBedTemperature) + "°C" : ""
font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text_inactive")
anchors.right: parent.right
@ -66,7 +66,7 @@ Item
UM.Label
{
id: bedCurrentTemperature
text: printerModel != null ? printerModel.bedTemperature + "°C" : ""
text: printerModel != null ? Math.round(printerModel.bedTemperature) + "°C" : ""
font: UM.Theme.getFont("large_bold")
anchors.right: bedTargetTemperature.left
anchors.top: parent.top

View file

@ -303,6 +303,7 @@ adhesion_extruder_nr
raft_surface_extruder_nr
skirt_line_count
skirt_gap
skirt_height
skirt_brim_minimal_length
brim_width
brim_gap