3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'um-master' into gh-issue-980

Browse source 
Conflicts:
	resources/definitions/fdmprinter.def.json
This commit is contained in:
nickthetait 2016-10-13 08:01:00 -06:00
commit bf331f39af
220 changed files with 111349 additions and 168598 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/definitions/bq_hephestos.def.json
View file

@ -37,7 +37,7 @@
"default_value": false
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"layer_height": {
"default_value": 0.2

2
resources/definitions/bq_hephestos_xl.def.json
View file

@ -37,7 +37,7 @@
"default_value": false
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"layer_height": {
"default_value": 0.2

2
resources/definitions/bq_witbox.def.json
View file

@ -37,7 +37,7 @@
"default_value": false
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"layer_height": {
"default_value": 0.2

2
resources/definitions/bq_witbox_2.def.json
View file

@ -37,7 +37,7 @@
"default_value": false
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"material_print_temperature": {
"default_value": 210

6
resources/definitions/fdmextruder.def.json
View file

@ -177,7 +177,8 @@
"minimum_value_warning": "machine_nozzle_offset_x",
"maximum_value": "machine_width",
"settable_per_mesh": false,
"settable_per_extruder": true
"settable_per_extruder": true,
"enabled": false
},
"extruder_prime_pos_y":
{
@ -189,7 +190,8 @@
"minimum_value_warning": "machine_nozzle_offset_y",
"maximum_value_warning": "machine_depth",
"settable_per_mesh": false,
"settable_per_extruder": true
"settable_per_extruder": true,
"enabled": false
}
}
}

484
resources/definitions/fdmprinter.def.json
View file

File diff suppressed because it is too large Load diff

67
resources/definitions/kossel_mini.def.json Normal file
View file

@ -0,0 +1,67 @@
{
"id": "kossel_mini",
"version": 2,
"name": "Kossel Mini",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "Claudio Sampaio (Patola)",
"manufacturer": "Other",
"category": "Other",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2",
"platform": "kossel_platform.stl"
},
"overrides": {
"machine_heated_bed": {
"default_value": true
},
"machine_width": {
"default_value": 170
},
"machine_height": {
"default_value": 200
},
"machine_depth": {
"default_value": 170
},
"machine_center_is_zero": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"material_diameter": {
"default_value": 1.75
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"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 all axes (max 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..."
},
"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\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning"
},
"machine_disallowed_areas": {
"default_value": [
[[-34, -85], [ -85, -85], [-70, -70]],
[[-85, -85], [-85, -34], [-70, -70]],
[[34, -85], [ 85, -85], [70, -70]],
[[85, -85], [85, -34], [70, -70]],
[[-34, 85], [ -85, 85], [-70, 70]],
[[-85, 85], [-85, 34], [-70, 70]],
[[34, 85], [ 85, 85], [70, 70]],
[[85, 85], [85, 34], [70, 70]]
]
}
}
}

4
resources/definitions/maker_starter.def.json
View file

@ -42,7 +42,7 @@
"default_value": 55
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"machine_disallowed_areas": {
"default_value": []
@ -144,7 +144,7 @@
"default_value": 15
},
"adhesion_type": {
"default_value": "Raft"
"default_value": "raft"
},
"skirt_brim_minimal_length": {
"default_value": 100

9
resources/definitions/rigidbot.def.json
View file

@ -88,16 +88,13 @@
"default_value": 0
},
"skirt_line_count": {
"default_value": 3,
"enabled": "adhesion_type == \"Skirt\""
"default_value": 3
},
"skirt_gap": {
"default_value": 4,
"enabled": "adhesion_type == \"Skirt\""
"default_value": 4
},
"skirt_brim_minimal_length": {
"default_value": 200,
"enabled": "adhesion_type == \"Skirt\""
"default_value": 200
}
}
}

9
resources/definitions/rigidbot_big.def.json
View file

@ -91,16 +91,13 @@
"default_value": 0
},
"skirt_line_count": {
"default_value": 3,
"enabled": "adhesion_type == \"Skirt\""
"default_value": 3
},
"skirt_gap": {
"default_value": 4,
"enabled": "adhesion_type == \"Skirt\""
"default_value": 4
},
"skirt_brim_minimal_length": {
"default_value": 200,
"enabled": "adhesion_type == \"Skirt\""
"default_value": 200
}
}
}

10
resources/definitions/ultimaker.def.json
View file

@ -20,6 +20,16 @@
},
"material_standby_temperature": {
"minimum_value": "0"
},
"extruder_prime_pos_y":
{
"minimum_value": "0",
"maximum_value": "machine_depth"
},
"extruder_prime_pos_x":
{
"minimum_value": "0",
"maximum_value": "machine_width"
}
}
}

3199
resources/i18n/de/cura.po
View file

File diff suppressed because it is too large Load diff

182
resources/i18n/de/fdmextruder.def.json.po Normal file
View file

@ -0,0 +1,182 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
"POT-Creation-Date: 2016-09-20 17:35+0000\n"
"PO-Revision-Date: 2016-09-29 13:02+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: fdmextruder.def.json
msgctxt "machine_settings label"
msgid "Machine"
msgstr "Gerät"
#: fdmextruder.def.json
msgctxt "machine_settings description"
msgid "Machine specific settings"
msgstr "Gerätespezifische Einstellungen"
#: fdmextruder.def.json
msgctxt "extruder_nr label"
msgid "Extruder"
msgstr "Extruder"
#: fdmextruder.def.json
msgctxt "extruder_nr description"
msgid "The extruder train used for printing. This is used in multi-extrusion."
msgstr "Die für das Drucken verwendete Extruder-Einheit. Diese wird für die Mehrfach-Extrusion benutzt."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x label"
msgid "Nozzle X Offset"
msgstr "X-Versatz Düse"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x description"
msgid "The x-coordinate of the offset of the nozzle."
msgstr "Die X-Koordinate des Düsenversatzes."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y label"
msgid "Nozzle Y Offset"
msgstr "Y-Versatz Düse"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y description"
msgid "The y-coordinate of the offset of the nozzle."
msgstr "Die Y-Koordinate des Düsenversatzes."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code label"
msgid "Extruder Start G-Code"
msgstr "G-Code Extruder-Start"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code description"
msgid "Start g-code to execute whenever turning the extruder on."
msgstr "Starten Sie den G-Code jedes Mal, wenn Sie den Extruder einschalten."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs label"
msgid "Extruder Start Position Absolute"
msgstr "Absolute Startposition des Extruders"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs description"
msgid ""
"Make the extruder starting position absolute rather than relative to the "
"last-known location of the head."
msgstr "Bevorzugen Sie eine absolute Startposition des Extruders anstelle einer relativen Position zur zuletzt bekannten Kopfposition."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x label"
msgid "Extruder Start Position X"
msgstr "X-Position Extruder-Start"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x description"
msgid "The x-coordinate of the starting position when turning the extruder on."
msgstr "Die X-Koordinate der Startposition beim Einschalten des Extruders."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y label"
msgid "Extruder Start Position Y"
msgstr "Y-Position Extruder-Start"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y description"
msgid "The y-coordinate of the starting position when turning the extruder on."
msgstr "Die Y-Koordinate der Startposition beim Einschalten des Extruders."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code label"
msgid "Extruder End G-Code"
msgstr "G-Code Extruder-Ende"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code description"
msgid "End g-code to execute whenever turning the extruder off."
msgstr "Beenden Sie den G-Code jedes Mal, wenn Sie den Extruder ausschalten."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs label"
msgid "Extruder End Position Absolute"
msgstr "Absolute Extruder-Endposition"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs description"
msgid ""
"Make the extruder ending position absolute rather than relative to the last-"
"known location of the head."
msgstr "Bevorzugen Sie eine absolute Endposition des Extruders anstelle einer relativen Position zur zuletzt bekannten Kopfposition."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x label"
msgid "Extruder End Position X"
msgstr "Extruder-Endposition X"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x description"
msgid "The x-coordinate of the ending position when turning the extruder off."
msgstr "Die X-Koordinate der Endposition beim Ausschalten des Extruders."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y label"
msgid "Extruder End Position Y"
msgstr "Extruder-Endposition Y"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y description"
msgid "The y-coordinate of the ending position when turning the extruder off."
msgstr "Die Y-Koordinate der Endposition beim Ausschalten des Extruders."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z label"
msgid "Extruder Prime Z Position"
msgstr "Z-Position Extruder-Einzug"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z description"
msgid ""
"The Z coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Die Z-Koordinate der Position, an der die Düse am Druckbeginn einzieht."
#: fdmextruder.def.json
msgctxt "platform_adhesion label"
msgid "Build Plate Adhesion"
msgstr "Druckplattenhaftung"
#: fdmextruder.def.json
msgctxt "platform_adhesion description"
msgid "Adhesion"
msgstr "Haftung"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x label"
msgid "Extruder Prime X Position"
msgstr "X-Position Extruder-Einzug"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x description"
msgid ""
"The X coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Die X-Koordinate der Position, an der die Düse am Druckbeginn einzieht."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y label"
msgid "Extruder Prime Y Position"
msgstr "Y-Position Extruder-Einzug"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y description"
msgid ""
"The Y coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Die Y-Koordinate der Position, an der die Düse am Druckbeginn einzieht."

4028
resources/i18n/de/fdmprinter.def.json.po Normal file
View file

File diff suppressed because it is too large Load diff

2429
resources/i18n/de/fdmprinter.json.po
View file

File diff suppressed because it is too large Load diff

6
resources/i18n/en/cura.po
View file

@ -953,7 +953,7 @@ msgid "Cancel"
msgstr "Cancel"
#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
msgctxt "@label"
msgctxt "@label Followed by extruder selection drop-down."
msgid "Print model with"
msgstr "Print model with"
@ -1852,12 +1852,12 @@ msgstr ""
"Click to make these settings visible."
#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
msgctxt "@label"
msgctxt "@label Header for list of settings."
msgid "Affects"
msgstr "Affects"
#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
msgctxt "@label"
msgctxt "@label Header for list of settings."
msgid "Affected By"
msgstr "Affected By"

2809
resources/i18n/en/fdmprinter.json.po
View file

File diff suppressed because it is too large Load diff

3127
resources/i18n/es/cura.po
View file

File diff suppressed because it is too large Load diff

182
resources/i18n/es/fdmextruder.def.json.po Normal file
View file

@ -0,0 +1,182 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
"POT-Creation-Date: 2016-09-20 17:35+0000\n"
"PO-Revision-Date: 2016-09-29 13:02+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: fdmextruder.def.json
msgctxt "machine_settings label"
msgid "Machine"
msgstr "Máquina"
#: fdmextruder.def.json
msgctxt "machine_settings description"
msgid "Machine specific settings"
msgstr "Ajustes específicos de la máquina"
#: fdmextruder.def.json
msgctxt "extruder_nr label"
msgid "Extruder"
msgstr "Extrusor"
#: fdmextruder.def.json
msgctxt "extruder_nr description"
msgid "The extruder train used for printing. This is used in multi-extrusion."
msgstr "El tren extrusor que se utiliza para imprimir. Se emplea en la extrusión múltiple."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x label"
msgid "Nozzle X Offset"
msgstr "Desplazamiento de la tobera sobre el eje X"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x description"
msgid "The x-coordinate of the offset of the nozzle."
msgstr "Coordenada X del desplazamiento de la tobera."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y label"
msgid "Nozzle Y Offset"
msgstr "Desplazamiento de la tobera sobre el eje Y"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y description"
msgid "The y-coordinate of the offset of the nozzle."
msgstr "Coordenada Y del desplazamiento de la tobera."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code label"
msgid "Extruder Start G-Code"
msgstr "Gcode inicial del extrusor"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code description"
msgid "Start g-code to execute whenever turning the extruder on."
msgstr "Gcode inicial que se ejecuta cada vez que se enciende el extrusor."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs label"
msgid "Extruder Start Position Absolute"
msgstr "Posición de inicio absoluta del extrusor"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs description"
msgid ""
"Make the extruder starting position absolute rather than relative to the "
"last-known location of the head."
msgstr "El extrusor se coloca en la posición de inicio absoluta según la última ubicación conocida del cabezal."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x label"
msgid "Extruder Start Position X"
msgstr "Posición de inicio del extrusor sobre el eje X"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x description"
msgid "The x-coordinate of the starting position when turning the extruder on."
msgstr "Coordenada X de la posición de inicio cuando se enciende el extrusor."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y label"
msgid "Extruder Start Position Y"
msgstr "Posición de inicio del extrusor sobre el eje Y"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y description"
msgid "The y-coordinate of the starting position when turning the extruder on."
msgstr "Coordenada Y de la posición de inicio cuando se enciende el extrusor."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code label"
msgid "Extruder End G-Code"
msgstr "Gcode final del extrusor"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code description"
msgid "End g-code to execute whenever turning the extruder off."
msgstr "Gcode final que se ejecuta cada vez que se apaga el extrusor."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs label"
msgid "Extruder End Position Absolute"
msgstr "Posición final absoluta del extrusor"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs description"
msgid ""
"Make the extruder ending position absolute rather than relative to the last-"
"known location of the head."
msgstr "La posición final del extrusor se considera absoluta, en lugar de relativa a la última ubicación conocida del cabezal."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x label"
msgid "Extruder End Position X"
msgstr "Posición de fin del extrusor sobre el eje X"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x description"
msgid "The x-coordinate of the ending position when turning the extruder off."
msgstr "Coordenada X de la posición de fin cuando se apaga el extrusor."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y label"
msgid "Extruder End Position Y"
msgstr "Posición de fin del extrusor sobre el eje Y"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y description"
msgid "The y-coordinate of the ending position when turning the extruder off."
msgstr "Coordenada Y de la posición de fin cuando se apaga el extrusor."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z label"
msgid "Extruder Prime Z Position"
msgstr "Posición de preparación del extrusor sobre el eje Z"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z description"
msgid ""
"The Z coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Coordenada Z de la posición en la que la tobera queda preparada al inicio de la impresión."
#: fdmextruder.def.json
msgctxt "platform_adhesion label"
msgid "Build Plate Adhesion"
msgstr "Adherencia de la placa de impresión"
#: fdmextruder.def.json
msgctxt "platform_adhesion description"
msgid "Adhesion"
msgstr "Adherencia"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x label"
msgid "Extruder Prime X Position"
msgstr "Posición de preparación del extrusor sobre el eje X"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x description"
msgid ""
"The X coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Coordenada X de la posición en la que la tobera se coloca al inicio de la impresión."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y label"
msgid "Extruder Prime Y Position"
msgstr "Posición de preparación del extrusor sobre el eje Y"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y description"
msgid ""
"The Y coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Coordenada X de la posición en la que la tobera se coloca al inicio de la impresión."

4028
resources/i18n/es/fdmprinter.def.json.po Normal file
View file

File diff suppressed because it is too large Load diff

2429
resources/i18n/es/fdmprinter.json.po
View file

File diff suppressed because it is too large Load diff

182
resources/i18n/fdmextruder.def.json.pot Normal file
View file

@ -0,0 +1,182 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
"POT-Creation-Date: 2016-09-20 14:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: fdmextruder.def.json
msgctxt "machine_settings label"
msgid "Machine"
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_settings description"
msgid "Machine specific settings"
msgstr ""
#: fdmextruder.def.json
msgctxt "extruder_nr label"
msgid "Extruder"
msgstr ""
#: fdmextruder.def.json
msgctxt "extruder_nr description"
msgid "The extruder train used for printing. This is used in multi-extrusion."
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x label"
msgid "Nozzle X Offset"
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x description"
msgid "The x-coordinate of the offset of the nozzle."
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y label"
msgid "Nozzle Y Offset"
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y description"
msgid "The y-coordinate of the offset of the nozzle."
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code label"
msgid "Extruder Start G-Code"
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code description"
msgid "Start g-code to execute whenever turning the extruder on."
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs label"
msgid "Extruder Start Position Absolute"
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs description"
msgid ""
"Make the extruder starting position absolute rather than relative to the "
"last-known location of the head."
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x label"
msgid "Extruder Start Position X"
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x description"
msgid "The x-coordinate of the starting position when turning the extruder on."
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y label"
msgid "Extruder Start Position Y"
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y description"
msgid "The y-coordinate of the starting position when turning the extruder on."
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code label"
msgid "Extruder End G-Code"
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code description"
msgid "End g-code to execute whenever turning the extruder off."
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs label"
msgid "Extruder End Position Absolute"
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs description"
msgid ""
"Make the extruder ending position absolute rather than relative to the last-"
"known location of the head."
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x label"
msgid "Extruder End Position X"
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x description"
msgid "The x-coordinate of the ending position when turning the extruder off."
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y label"
msgid "Extruder End Position Y"
msgstr ""
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y description"
msgid "The y-coordinate of the ending position when turning the extruder off."
msgstr ""
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z label"
msgid "Extruder Prime Z Position"
msgstr ""
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z description"
msgid ""
"The Z coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr ""
#: fdmextruder.def.json
msgctxt "platform_adhesion label"
msgid "Build Plate Adhesion"
msgstr ""
#: fdmextruder.def.json
msgctxt "platform_adhesion description"
msgid "Adhesion"
msgstr ""
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x label"
msgid "Extruder Prime X Position"
msgstr ""
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x description"
msgid ""
"The X coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr ""
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y label"
msgid "Extruder Prime Y Position"
msgstr ""
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y description"
msgid ""
"The Y coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr ""

4014
resources/i18n/fdmprinter.def.json.pot Normal file
View file

File diff suppressed because it is too large Load diff

2429
resources/i18n/fdmprinter.json.pot
View file

File diff suppressed because it is too large Load diff

3164
resources/i18n/fi/cura.po
View file

File diff suppressed because it is too large Load diff

182
resources/i18n/fi/fdmextruder.def.json.po Normal file
View file

@ -0,0 +1,182 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
"POT-Creation-Date: 2016-09-20 17:35+0000\n"
"PO-Revision-Date: 2016-09-29 13:02+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: fdmextruder.def.json
msgctxt "machine_settings label"
msgid "Machine"
msgstr "Laite"
#: fdmextruder.def.json
msgctxt "machine_settings description"
msgid "Machine specific settings"
msgstr "Laitekohtaiset asetukset"
#: fdmextruder.def.json
msgctxt "extruder_nr label"
msgid "Extruder"
msgstr "Suulake"
#: fdmextruder.def.json
msgctxt "extruder_nr description"
msgid "The extruder train used for printing. This is used in multi-extrusion."
msgstr "Tulostukseen käytettävä suulakeryhmä. Tätä käytetään monipursotuksessa."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x label"
msgid "Nozzle X Offset"
msgstr "Suuttimen X-siirtymä"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x description"
msgid "The x-coordinate of the offset of the nozzle."
msgstr "Suuttimen siirtymän X-koordinaatti."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y label"
msgid "Nozzle Y Offset"
msgstr "Suuttimen Y-siirtymä"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y description"
msgid "The y-coordinate of the offset of the nozzle."
msgstr "Suuttimen siirtymän Y-koordinaatti."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code label"
msgid "Extruder Start G-Code"
msgstr "Suulakkeen aloitus-GCode"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code description"
msgid "Start g-code to execute whenever turning the extruder on."
msgstr "Aloitus-GCode, joka suoritetaan suulakkeen käynnistyksen yhteydessä."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs label"
msgid "Extruder Start Position Absolute"
msgstr "Suulakkeen aloitussijainti absoluuttinen"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs description"
msgid ""
"Make the extruder starting position absolute rather than relative to the "
"last-known location of the head."
msgstr "Tekee suulakkeen aloitussijainnista absoluuttisen eikä suhteellisen viimeksi tunnettuun pään sijaintiin nähden."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x label"
msgid "Extruder Start Position X"
msgstr "Suulakkeen aloitussijainti X"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x description"
msgid "The x-coordinate of the starting position when turning the extruder on."
msgstr "Aloitussijainnin X-koordinaatti suulaketta käynnistettäessä."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y label"
msgid "Extruder Start Position Y"
msgstr "Suulakkeen aloitussijainti Y"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y description"
msgid "The y-coordinate of the starting position when turning the extruder on."
msgstr "Aloitussijainnin Y-koordinaatti suulaketta käynnistettäessä."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code label"
msgid "Extruder End G-Code"
msgstr "Suulakkeen lopetus-GCode"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code description"
msgid "End g-code to execute whenever turning the extruder off."
msgstr "Lopetus-GCode, joka suoritetaan, kun suulake poistetaan käytöstä."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs label"
msgid "Extruder End Position Absolute"
msgstr "Suulakkeen lopetussijainti absoluuttinen"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs description"
msgid ""
"Make the extruder ending position absolute rather than relative to the last-"
"known location of the head."
msgstr "Tekee suulakkeen lopetussijainnista absoluuttisen eikä suhteellisen viimeksi tunnettuun pään sijaintiin nähden."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x label"
msgid "Extruder End Position X"
msgstr "Suulakkeen lopetussijainti X"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x description"
msgid "The x-coordinate of the ending position when turning the extruder off."
msgstr "Lopetussijainnin X-koordinaatti, kun suulake poistetaan käytöstä."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y label"
msgid "Extruder End Position Y"
msgstr "Suulakkeen lopetussijainti Y"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y description"
msgid "The y-coordinate of the ending position when turning the extruder off."
msgstr "Lopetussijainnin Y-koordinaatti, kun suulake poistetaan käytöstä."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z label"
msgid "Extruder Prime Z Position"
msgstr "Suulakkeen esitäytön Z-sijainti"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z description"
msgid ""
"The Z coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Z-koordinaatti sijainnille, jossa suutin esitäytetään tulostusta aloitettaessa."
#: fdmextruder.def.json
msgctxt "platform_adhesion label"
msgid "Build Plate Adhesion"
msgstr "Alustan tarttuvuus"
#: fdmextruder.def.json
msgctxt "platform_adhesion description"
msgid "Adhesion"
msgstr "Tarttuvuus"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x label"
msgid "Extruder Prime X Position"
msgstr "Suulakkeen esitäytön X-sijainti"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x description"
msgid ""
"The X coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "X-koordinaatti sijainnille, jossa suutin esitäytetään tulostusta aloitettaessa."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y label"
msgid "Extruder Prime Y Position"
msgstr "Suulakkeen esitäytön Y-sijainti"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y description"
msgid ""
"The Y coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Y-koordinaatti sijainnille, jossa suutin esitäytetään tulostusta aloitettaessa."

4028
resources/i18n/fi/fdmprinter.def.json.po Normal file
View file

File diff suppressed because it is too large Load diff

2429
resources/i18n/fi/fdmprinter.json.po
View file

File diff suppressed because it is too large Load diff

3164
resources/i18n/fr/cura.po
View file

File diff suppressed because it is too large Load diff

182
resources/i18n/fr/fdmextruder.def.json.po Normal file
View file

@ -0,0 +1,182 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
"POT-Creation-Date: 2016-09-20 17:35+0000\n"
"PO-Revision-Date: 2016-09-29 13:02+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: fdmextruder.def.json
msgctxt "machine_settings label"
msgid "Machine"
msgstr "Machine"
#: fdmextruder.def.json
msgctxt "machine_settings description"
msgid "Machine specific settings"
msgstr "Paramètres spécifiques de la machine"
#: fdmextruder.def.json
msgctxt "extruder_nr label"
msgid "Extruder"
msgstr "Extrudeuse"
#: fdmextruder.def.json
msgctxt "extruder_nr description"
msgid "The extruder train used for printing. This is used in multi-extrusion."
msgstr "Le train d'extrudeuse utilisé pour l'impression. Cela est utilisé en multi-extrusion."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x label"
msgid "Nozzle X Offset"
msgstr "Buse Décalage X"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x description"
msgid "The x-coordinate of the offset of the nozzle."
msgstr "Les coordonnées X du décalage de la buse."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y label"
msgid "Nozzle Y Offset"
msgstr "Buse Décalage Y"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y description"
msgid "The y-coordinate of the offset of the nozzle."
msgstr "Les coordonnées Y du décalage de la buse."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code label"
msgid "Extruder Start G-Code"
msgstr "Extrudeuse G-Code de démarrage"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code description"
msgid "Start g-code to execute whenever turning the extruder on."
msgstr "G-Code de démarrage à exécuter à chaque mise en marche de l'extrudeuse."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs label"
msgid "Extruder Start Position Absolute"
msgstr "Extrudeuse Position de départ absolue"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs description"
msgid ""
"Make the extruder starting position absolute rather than relative to the "
"last-known location of the head."
msgstr "Rendre la position de départ de l'extrudeuse absolue plutôt que relative à la dernière position connue de la tête."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x label"
msgid "Extruder Start Position X"
msgstr "Extrudeuse Position de départ X"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x description"
msgid "The x-coordinate of the starting position when turning the extruder on."
msgstr "Les coordonnées X de la position de départ lors de la mise en marche de l'extrudeuse."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y label"
msgid "Extruder Start Position Y"
msgstr "Extrudeuse Position de départ Y"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y description"
msgid "The y-coordinate of the starting position when turning the extruder on."
msgstr "Les coordonnées Y de la position de départ lors de la mise en marche de l'extrudeuse."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code label"
msgid "Extruder End G-Code"
msgstr "Extrudeuse G-Code de fin"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code description"
msgid "End g-code to execute whenever turning the extruder off."
msgstr "G-Code de fin à exécuter à chaque arrêt de l'extrudeuse."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs label"
msgid "Extruder End Position Absolute"
msgstr "Extrudeuse Position de fin absolue"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs description"
msgid ""
"Make the extruder ending position absolute rather than relative to the last-"
"known location of the head."
msgstr "Rendre la position de fin de l'extrudeuse absolue plutôt que relative à la dernière position connue de la tête."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x label"
msgid "Extruder End Position X"
msgstr "Extrudeuse Position de fin X"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x description"
msgid "The x-coordinate of the ending position when turning the extruder off."
msgstr "Les coordonnées X de la position de fin lors de l'arrêt de l'extrudeuse."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y label"
msgid "Extruder End Position Y"
msgstr "Extrudeuse Position de fin Y"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y description"
msgid "The y-coordinate of the ending position when turning the extruder off."
msgstr "Les coordonnées Y de la position de fin lors de l'arrêt de l'extrudeuse."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z label"
msgid "Extruder Prime Z Position"
msgstr "Extrudeuse Position d'amorçage Z"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z description"
msgid ""
"The Z coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Les coordonnées Z de la position à laquelle la buse s'amorce au début de l'impression."
#: fdmextruder.def.json
msgctxt "platform_adhesion label"
msgid "Build Plate Adhesion"
msgstr "Adhérence du plateau"
#: fdmextruder.def.json
msgctxt "platform_adhesion description"
msgid "Adhesion"
msgstr "Adhérence"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x label"
msgid "Extruder Prime X Position"
msgstr "Extrudeuse Position d'amorçage X"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x description"
msgid ""
"The X coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Les coordonnées X de la position à laquelle la buse s'amorce au début de l'impression."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y label"
msgid "Extruder Prime Y Position"
msgstr "Extrudeuse Position d'amorçage Y"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y description"
msgid ""
"The Y coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Les coordonnées Y de la position à laquelle la buse s'amorce au début de l'impression."

4028
resources/i18n/fr/fdmprinter.def.json.po Normal file
View file

File diff suppressed because it is too large Load diff

2429
resources/i18n/fr/fdmprinter.json.po
View file

File diff suppressed because it is too large Load diff

3125
resources/i18n/it/cura.po
View file

File diff suppressed because it is too large Load diff

182
resources/i18n/it/fdmextruder.def.json.po Normal file
View file

@ -0,0 +1,182 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
"POT-Creation-Date: 2016-09-20 17:35+0000\n"
"PO-Revision-Date: 2016-09-29 13:02+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: fdmextruder.def.json
msgctxt "machine_settings label"
msgid "Machine"
msgstr "Macchina"
#: fdmextruder.def.json
msgctxt "machine_settings description"
msgid "Machine specific settings"
msgstr "Impostazioni macchina specifiche"
#: fdmextruder.def.json
msgctxt "extruder_nr label"
msgid "Extruder"
msgstr "Estrusore"
#: fdmextruder.def.json
msgctxt "extruder_nr description"
msgid "The extruder train used for printing. This is used in multi-extrusion."
msgstr "Treno estrusore utilizzato per la stampa. Utilizzato nell’estrusione multipla."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x label"
msgid "Nozzle X Offset"
msgstr "Offset X ugello"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x description"
msgid "The x-coordinate of the offset of the nozzle."
msgstr "La coordinata y dell’offset dell’ugello."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y label"
msgid "Nozzle Y Offset"
msgstr "Offset Y ugello"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y description"
msgid "The y-coordinate of the offset of the nozzle."
msgstr "La coordinata y dell’offset dell’ugello."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code label"
msgid "Extruder Start G-Code"
msgstr "Codice G avvio estrusore"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code description"
msgid "Start g-code to execute whenever turning the extruder on."
msgstr "Codice G di avvio da eseguire ogniqualvolta si accende l’estrusore."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs label"
msgid "Extruder Start Position Absolute"
msgstr "Assoluto posizione avvio estrusore"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs description"
msgid ""
"Make the extruder starting position absolute rather than relative to the "
"last-known location of the head."
msgstr "Rende la posizione di partenza estrusore assoluta anziché relativa rispetto all’ultima posizione nota della testina."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x label"
msgid "Extruder Start Position X"
msgstr "X posizione avvio estrusore"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x description"
msgid "The x-coordinate of the starting position when turning the extruder on."
msgstr "La coordinata x della posizione di partenza all’accensione dell’estrusore."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y label"
msgid "Extruder Start Position Y"
msgstr "Y posizione avvio estrusore"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y description"
msgid "The y-coordinate of the starting position when turning the extruder on."
msgstr "La coordinata y della posizione di partenza all’accensione dell’estrusore."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code label"
msgid "Extruder End G-Code"
msgstr "Codice G fine estrusore"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code description"
msgid "End g-code to execute whenever turning the extruder off."
msgstr "Codice G di fine da eseguire ogniqualvolta si spegne l’estrusore."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs label"
msgid "Extruder End Position Absolute"
msgstr "Assoluto posizione fine estrusore"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs description"
msgid ""
"Make the extruder ending position absolute rather than relative to the last-"
"known location of the head."
msgstr "Rende la posizione di fine estrusore assoluta anziché relativa rispetto all’ultima posizione nota della testina."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x label"
msgid "Extruder End Position X"
msgstr "Posizione X fine estrusore"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x description"
msgid "The x-coordinate of the ending position when turning the extruder off."
msgstr "La coordinata x della posizione di fine allo spegnimento dell’estrusore."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y label"
msgid "Extruder End Position Y"
msgstr "Posizione Y fine estrusore"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y description"
msgid "The y-coordinate of the ending position when turning the extruder off."
msgstr "La coordinata y della posizione di fine allo spegnimento dell’estrusore."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z label"
msgid "Extruder Prime Z Position"
msgstr "Posizione Z innesco estrusore"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z description"
msgid ""
"The Z coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Indica la coordinata Z della posizione in cui l’ugello si innesca all’avvio della stampa."
#: fdmextruder.def.json
msgctxt "platform_adhesion label"
msgid "Build Plate Adhesion"
msgstr "Adesione piano di stampa"
#: fdmextruder.def.json
msgctxt "platform_adhesion description"
msgid "Adhesion"
msgstr "Adesione"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x label"
msgid "Extruder Prime X Position"
msgstr "Posizione X innesco estrusore"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x description"
msgid ""
"The X coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "La coordinata X della posizione in cui l’ugello si innesca all’avvio della stampa."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y label"
msgid "Extruder Prime Y Position"
msgstr "Posizione Y innesco estrusore"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y description"
msgid ""
"The Y coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "La coordinata Y della posizione in cui l’ugello si innesca all’avvio della stampa."

4028
resources/i18n/it/fdmprinter.def.json.po Normal file
View file

File diff suppressed because it is too large Load diff

2431
resources/i18n/it/fdmprinter.json.po
View file

File diff suppressed because it is too large Load diff

3129
resources/i18n/nl/cura.po
View file

File diff suppressed because it is too large Load diff

182
resources/i18n/nl/fdmextruder.def.json.po Normal file
View file

@ -0,0 +1,182 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
"POT-Creation-Date: 2016-09-20 17:35+0000\n"
"PO-Revision-Date: 2016-09-29 13:02+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: fdmextruder.def.json
msgctxt "machine_settings label"
msgid "Machine"
msgstr "Machine"
#: fdmextruder.def.json
msgctxt "machine_settings description"
msgid "Machine specific settings"
msgstr "Instellingen van de machine"
#: fdmextruder.def.json
msgctxt "extruder_nr label"
msgid "Extruder"
msgstr "Extruder"
#: fdmextruder.def.json
msgctxt "extruder_nr description"
msgid "The extruder train used for printing. This is used in multi-extrusion."
msgstr "De extruder train die voor het printen wordt gebruikt. Deze wordt gebruikt in meervoudige doorvoer."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x label"
msgid "Nozzle X Offset"
msgstr "Offset X-nozzle"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x description"
msgid "The x-coordinate of the offset of the nozzle."
msgstr "De X-coördinaat van de offset van de nozzle."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y label"
msgid "Nozzle Y Offset"
msgstr "Offset Y-nozzle"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y description"
msgid "The y-coordinate of the offset of the nozzle."
msgstr "De Y-coördinaat van de offset van de nozzle."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code label"
msgid "Extruder Start G-Code"
msgstr "G-code van extruderstart"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code description"
msgid "Start g-code to execute whenever turning the extruder on."
msgstr "Start-g-code die wordt uitgevoerd wanneer de extruder wordt ingeschakeld."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs label"
msgid "Extruder Start Position Absolute"
msgstr "Absolute startpositie extruder"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs description"
msgid ""
"Make the extruder starting position absolute rather than relative to the "
"last-known location of the head."
msgstr "Maak van de startpositie van de extruder de absolute startpositie, in plaats van de relatieve startpositie ten opzichte van de laatst bekende locatie van de printkop."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x label"
msgid "Extruder Start Position X"
msgstr "X-startpositie extruder"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x description"
msgid "The x-coordinate of the starting position when turning the extruder on."
msgstr "De X-coördinaat van de startpositie wanneer de extruder wordt ingeschakeld."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y label"
msgid "Extruder Start Position Y"
msgstr "Y-startpositie extruder"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y description"
msgid "The y-coordinate of the starting position when turning the extruder on."
msgstr "De Y-coördinaat van de startpositie wanneer de extruder wordt ingeschakeld."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code label"
msgid "Extruder End G-Code"
msgstr "G-code van extrudereinde"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code description"
msgid "End g-code to execute whenever turning the extruder off."
msgstr "Eind-g-code die wordt uitgevoerd wanneer de extruder wordt uitgeschakeld."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs label"
msgid "Extruder End Position Absolute"
msgstr "Absolute eindpositie extruder"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs description"
msgid ""
"Make the extruder ending position absolute rather than relative to the last-"
"known location of the head."
msgstr "Maak van de eindpositie van de extruder de absolute eindpositie, in plaats van de relatieve eindpositie ten opzichte van de laatst bekende locatie van de printkop."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x label"
msgid "Extruder End Position X"
msgstr "X-eindpositie extruder"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x description"
msgid "The x-coordinate of the ending position when turning the extruder off."
msgstr "De X-coördinaat van de eindpositie wanneer de extruder wordt uitgeschakeld."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y label"
msgid "Extruder End Position Y"
msgstr "Y-eindpositie extruder"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y description"
msgid "The y-coordinate of the ending position when turning the extruder off."
msgstr "De Y-coördinaat van de eindpositie wanneer de extruder wordt uitgeschakeld."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z label"
msgid "Extruder Prime Z Position"
msgstr "Z-positie voor primen extruder"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z description"
msgid ""
"The Z coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "De Z-coördinaat van de positie waar filament in de nozzle wordt teruggeduwd aan het begin van het printen."
#: fdmextruder.def.json
msgctxt "platform_adhesion label"
msgid "Build Plate Adhesion"
msgstr "Hechting aan platform"
#: fdmextruder.def.json
msgctxt "platform_adhesion description"
msgid "Adhesion"
msgstr "Hechting"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x label"
msgid "Extruder Prime X Position"
msgstr "X-positie voor primen extruder"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x description"
msgid ""
"The X coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "De X-coördinaat van de positie waar filament in de nozzle wordt teruggeduwd aan het begin van het printen."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y label"
msgid "Extruder Prime Y Position"
msgstr "Y-positie voor primen extruder"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y description"
msgid ""
"The Y coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "De Y-coördinaat van de positie waar filament in de nozzle wordt teruggeduwd aan het begin van het printen."

4028
resources/i18n/nl/fdmprinter.def.json.po Normal file
View file

File diff suppressed because it is too large Load diff

2429
resources/i18n/nl/fdmprinter.json.po
View file

File diff suppressed because it is too large Load diff

2335
resources/i18n/tr/cura.po Normal file
View file

File diff suppressed because it is too large Load diff

182
resources/i18n/tr/fdmextruder.def.json.po Normal file
View file

@ -0,0 +1,182 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
"POT-Creation-Date: 2016-09-20 17:35+0000\n"
"PO-Revision-Date: 2016-09-29 13:02+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: fdmextruder.def.json
msgctxt "machine_settings label"
msgid "Machine"
msgstr "Makine"
#: fdmextruder.def.json
msgctxt "machine_settings description"
msgid "Machine specific settings"
msgstr "Makine özel ayarları"
#: fdmextruder.def.json
msgctxt "extruder_nr label"
msgid "Extruder"
msgstr "Ekstruder"
#: fdmextruder.def.json
msgctxt "extruder_nr description"
msgid "The extruder train used for printing. This is used in multi-extrusion."
msgstr "Yazdırma için kullanılan ekstruder dişli çark. Çoklu ekstrüzyon işlemi için kullanılır."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x label"
msgid "Nozzle X Offset"
msgstr "Nozül NX Ofseti"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_x description"
msgid "The x-coordinate of the offset of the nozzle."
msgstr "Nozül ofsetinin x koordinatı."
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y label"
msgid "Nozzle Y Offset"
msgstr "Nozül Y Ofseti"
#: fdmextruder.def.json
msgctxt "machine_nozzle_offset_y description"
msgid "The y-coordinate of the offset of the nozzle."
msgstr "Nozül ofsetinin y koordinatı."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code label"
msgid "Extruder Start G-Code"
msgstr "Ekstruder G-Code'u başlatma"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_code description"
msgid "Start g-code to execute whenever turning the extruder on."
msgstr "Ekstruderi her açtığınızda g-code'u başlatın."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs label"
msgid "Extruder Start Position Absolute"
msgstr "Ekstruderin Mutlak Başlangıç Konumu"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_abs description"
msgid ""
"Make the extruder starting position absolute rather than relative to the "
"last-known location of the head."
msgstr "Ekstruder başlama konumunu, yazıcı başlığının son konumuna göre ayarlamak yerine mutlak olarak ayarlayın."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x label"
msgid "Extruder Start Position X"
msgstr "Ekstruder X Başlangıç Konumu"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_x description"
msgid "The x-coordinate of the starting position when turning the extruder on."
msgstr "Ekstruder açılırken başlangıç konumunun x koordinatı."
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y label"
msgid "Extruder Start Position Y"
msgstr "Ekstruder Y Başlangıç Konumu"
#: fdmextruder.def.json
msgctxt "machine_extruder_start_pos_y description"
msgid "The y-coordinate of the starting position when turning the extruder on."
msgstr "Ekstruder açılırken başlangıç konumunun Y koordinatı."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code label"
msgid "Extruder End G-Code"
msgstr "Ekstruder G-Code'u Sonlandırma"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_code description"
msgid "End g-code to execute whenever turning the extruder off."
msgstr "Ekstruderi her kapattığınızda g-code'u sonlandırın."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs label"
msgid "Extruder End Position Absolute"
msgstr "Ekstruderin Mutlak Bitiş Konumu"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_abs description"
msgid ""
"Make the extruder ending position absolute rather than relative to the last-"
"known location of the head."
msgstr "Ekstruder bitiş konumunu, yazıcı başlığının son konumuna göre ayarlamak yerine mutlak olarak ayarlayın."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x label"
msgid "Extruder End Position X"
msgstr "Ekstruderin X Bitiş Konumu"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_x description"
msgid "The x-coordinate of the ending position when turning the extruder off."
msgstr "Ekstruder kapatılırken bitiş konumunun x koordinatı."
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y label"
msgid "Extruder End Position Y"
msgstr "Ekstruderin Y Bitiş Konumu"
#: fdmextruder.def.json
msgctxt "machine_extruder_end_pos_y description"
msgid "The y-coordinate of the ending position when turning the extruder off."
msgstr "Ekstruder kapatılırken bitiş konumunun Y koordinatı."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z label"
msgid "Extruder Prime Z Position"
msgstr "Ekstruder İlk Z konumu"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_z description"
msgid ""
"The Z coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Nozül yazdırma işlemini başlatmaya hazırlandığında konumun Z koordinatı."
#: fdmextruder.def.json
msgctxt "platform_adhesion label"
msgid "Build Plate Adhesion"
msgstr "Yapı Levhası Yapıştırması"
#: fdmextruder.def.json
msgctxt "platform_adhesion description"
msgid "Adhesion"
msgstr "Yapıştırma"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x label"
msgid "Extruder Prime X Position"
msgstr "Extruder İlk X konumu"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_x description"
msgid ""
"The X coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Nozül yazdırma işlemini başlatmaya hazırlandığında konumun X koordinatı."
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y label"
msgid "Extruder Prime Y Position"
msgstr "Extruder İlk Y konumu"
#: fdmextruder.def.json
msgctxt "extruder_prime_pos_y description"
msgid ""
"The Y coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr "Nozül yazdırma işlemini başlatmaya hazırlandığında konumun Y koordinatı."

4028
resources/i18n/tr/fdmprinter.def.json.po Normal file
View file

File diff suppressed because it is too large Load diff

2
resources/materials/generic_nylon.xml.fdm_material
View file

@ -9,7 +9,7 @@ Generic Nylon profile. Serves as an example file, data in this file is not corre
<material>Nylon</material>
<color>Generic</color>
</name>
<GUID>35ebb8df-66d2-41cd-9662-b7d96b9c2cbd</GUID>
<GUID>28fb4162-db74-49e1-9008-d05f1e8bef5c</GUID>
<version>1</version>
<color_code>#3DF266</color_code>
</metadata>

25
resources/materials/ultimaker_nylon_black.xml.fdm_material Normal file
View file

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Generic Nylon profile. Serves as an example file, data in this file is not correct.
-->
<fdmmaterial xmlns="http://www.ultimaker.com/material">
<metadata>
<name>
<brand>Ultimaker</brand>
<material>Nylon</material>
<color>Black</color>
</name>
<GUID>c64c2dbe-5691-4363-a7d9-66b2dc12837f</GUID>
<version>1</version>
<color_code>#000000</color_code>
</metadata>
<properties>
<density>1.14</density>
<diameter>2.85</diameter>
</properties>
<settings>
<setting key="print temperature">250</setting>
<setting key="heated bed temperature">60</setting>
<setting key="standby temperature">175</setting>
</settings>
</fdmmaterial>

25
resources/materials/ultimaker_nylon_transparent.xml.fdm_material Normal file
View file

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Generic Nylon profile. Serves as an example file, data in this file is not correct.
-->
<fdmmaterial xmlns="http://www.ultimaker.com/material">
<metadata>
<name>
<brand>Ultimaker</brand>
<material>Nylon</material>
<color>Transparent</color>
</name>
<GUID>e256615d-a04e-4f53-b311-114b90560af9</GUID>
<version>1</version>
<color_code>#FFFFFF</color_code>
</metadata>
<properties>
<density>1.14</density>
<diameter>2.85</diameter>
</properties>
<settings>
<setting key="print temperature">250</setting>
<setting key="heated bed temperature">60</setting>
<setting key="standby temperature">175</setting>
</settings>
</fdmmaterial>

1
resources/materials/ultimaker_pla_silver-metallic.xml.fdm_material
View file

@ -36,6 +36,7 @@ Automatically generated PLA profile. Data in this file may not be not correct.
<machine_identifier manufacturer="Ultimaker" product="Ultimaker 2"/>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker 2 Go"/>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker 2 Extended"/>
<setting key="standby temperature">150</setting>
<setting key="processing temperature graph">
<point flow="2" temperature="180"/>
<point flow="10" temperature="230"/>

58634
resources/meshes/kossel_platform.stl Normal file
View file

File diff suppressed because it is too large Load diff

23
resources/qml/Cura.qml
View file

@ -22,7 +22,6 @@ UM.MainWindow
Component.onCompleted:
{
Printer.setMinimumWindowSize(UM.Theme.getSize("window_minimum_size"))
// Workaround silly issues with QML Action's shortcut property.
//
// Currently, there is no way to define shortcuts as "Application Shortcut".
@ -403,7 +402,18 @@ UM.MainWindow
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: - UM.Theme.getSize("sidebar").width / 2
visible: base.monitoringPrint
source: Cura.MachineManager.printerOutputDevices.length > 0 && Cura.MachineManager.printerOutputDevices[0].cameraImage ? Cura.MachineManager.printerOutputDevices[0].cameraImage : ""
source:
{
if(!base.monitoringPrint)
{
return "";
}
if(Cura.MachineManager.printerOutputDevices.length > 0 && Cura.MachineManager.printerOutputDevices[0].cameraImage)
{
return Cura.MachineManager.printerOutputDevices[0].cameraImage;
}
return "";
}
}
UM.MessageStack
@ -656,10 +666,13 @@ UM.MainWindow
for(var i in fileUrls)
{
UM.MeshFileHandler.readLocalFile(fileUrls[i])
}
var meshName = backgroundItem.getMeshName(fileUrl.toString())
backgroundItem.hasMesh(decodeURIComponent(meshName))
if (i == fileUrls.length - 1)
{
var meshName = backgroundItem.getMeshName(fileUrls.toString())
backgroundItem.hasMesh(decodeURIComponent(meshName))
}
}
}
}

2
resources/qml/Menus/NozzleMenu.qml
View file

@ -52,7 +52,7 @@ Menu
filter:
{
"type": "variant",
"definition": Cura.MachineManager.activeDefinitionId //Only show variants of this machine
"definition": Cura.MachineManager.activeQualityDefinitionId //Only show variants of this machine
}
}
MenuItem {

12
resources/qml/Menus/ProfileMenu.qml
View file

@ -13,10 +13,7 @@ Menu
Instantiator
{
model: UM.InstanceContainersModel
{
filter: menu.getFilter({ "type": "quality" });
}
model: Cura.ProfilesModel { }
MenuItem
{
@ -36,13 +33,8 @@ Menu
Instantiator
{
id: customProfileInstantiator
model: UM.InstanceContainersModel
model: Cura.UserProfilesModel
{
filter: menu.getFilter({
"type": "quality_changes",
"extruder": null,
"definition": Cura.MachineManager.filterQualityByMachine ? Cura.MachineManager.activeQualityDefinitionId : "fdmprinter"
});
onModelReset: customSeparator.visible = rowCount() > 0
}

56
resources/qml/MonitorButton.qml
View file

@ -31,6 +31,8 @@ Rectangle
{
case "printing":
case "paused":
case "pausing":
case "resuming":
return true;
case "pre_print": // heating, etc.
case "wait_cleanup":
@ -62,6 +64,8 @@ Rectangle
case "printing":
case "pre_print":
case "wait_cleanup":
case "pausing":
case "resuming":
return UM.Theme.getColor("status_busy");
case "ready":
case "":
@ -99,8 +103,10 @@ Rectangle
return catalog.i18nc("@label:MonitorStatus", "Lost connection with the printer");
case "printing":
return catalog.i18nc("@label:MonitorStatus", "Printing...");
//TODO: Add text for case "pausing".
case "paused":
return catalog.i18nc("@label:MonitorStatus", "Paused");
//TODO: Add text for case "resuming".
case "pre_print":
return catalog.i18nc("@label:MonitorStatus", "Preparing...");
case "wait_cleanup":
@ -137,26 +143,44 @@ Rectangle
visible: showProgress
}
Rectangle
ProgressBar
{
id: progressBar
width: parent.width - 2 * UM.Theme.getSize("default_margin").width
height: UM.Theme.getSize("progressbar").height
anchors.top: statusLabel.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height / 4
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
radius: UM.Theme.getSize("progressbar_radius").width
color: UM.Theme.getColor("progressbar_background")
visible: showProgress
id: progressBar;
minimumValue: 0;
maximumValue: 100;
value: 0;
Rectangle
//Doing this in an explicit binding since the implicit binding breaks on occasion.
Binding
{
width: Math.max(parent.width * base.progress / 100)
height: parent.height
color: base.statusColor
radius: UM.Theme.getSize("progressbar_radius").width
target: progressBar;
property: "value";
value: base.progress;
}
visible: showProgress;
indeterminate:
{
switch(Cura.MachineManager.printerOutputDevices[0].jobState)
{
case "pausing":
case "resuming":
return true;
default:
return false;
}
}
style: UM.Theme.styles.progressbar;
property string backgroundColor: UM.Theme.getColor("progressbar_background");
property string controlColor: base.statusColor;
width: parent.width - 2 * UM.Theme.getSize("default_margin").width;
height: UM.Theme.getSize("progressbar").height;
anchors.top: statusLabel.bottom;
anchors.topMargin: UM.Theme.getSize("default_margin").height / 4;
anchors.left: parent.left;
anchors.leftMargin: UM.Theme.getSize("default_margin").width;
}
Row {

15
resources/qml/Preferences/GeneralPage.qml
View file

@ -90,13 +90,14 @@ UM.PreferencesPage
id: languageList
Component.onCompleted: {
append({ text: catalog.i18nc("@item:inlistbox", "English"), code: "en" })
append({ text: catalog.i18nc("@item:inlistbox", "Finnish"), code: "fi" })
append({ text: catalog.i18nc("@item:inlistbox", "French"), code: "fr" })
append({ text: catalog.i18nc("@item:inlistbox", "German"), code: "de" })
append({ text: catalog.i18nc("@item:inlistbox", "Italian"), code: "it" })
append({ text: catalog.i18nc("@item:inlistbox", "Dutch"), code: "nl" })
append({ text: catalog.i18nc("@item:inlistbox", "Spanish"), code: "es" })
append({ text: "English", code: "en" })
append({ text: "Deutsch", code: "de" })
append({ text: "Español", code: "es" })
append({ text: "Suomi", code: "fi" })
append({ text: "Français", code: "fr" })
append({ text: "Italiano", code: "it" })
append({ text: "Nederlands", code: "nl" })
append({ text: "Türkçe", code: "tr" })
}
}

7
resources/qml/Preferences/MaterialsPage.qml
View file

@ -1,5 +1,5 @@
// Copyright (c) 2016 Ultimaker B.V.
// Uranium is released under the terms of the AGPLv3 or higher.
// Cura is released under the terms of the AGPLv3 or higher.
import QtQuick 2.1
import QtQuick.Controls 1.1
@ -21,10 +21,10 @@ UM.ManagementPage
var result = { "type": "material" }
if(Cura.MachineManager.filterMaterialsByMachine)
{
result.definition = Cura.MachineManager.activeDefinitionId
result.definition = Cura.MachineManager.activeQualityDefinitionId;
if(Cura.MachineManager.hasVariants)
{
result.variant = Cura.MachineManager.activeVariantId
result.variant = Cura.MachineManager.activeQualityVariantId;
}
}
else
@ -254,6 +254,7 @@ UM.ManagementPage
{
Cura.ContainerManager.removeContainer(containers[i])
}
currentItem = base.model.getItem(base.objectList.currentIndex) // Refresh the current item.
}
}

37
resources/qml/Preferences/ProfileTab.qml
View file

@ -12,6 +12,7 @@ Tab
id: base
property string extruderId: "";
property string extruderDefinition: "";
property string quality: "";
property string material: "";
@ -20,17 +21,45 @@ Tab
anchors.fill: parent
anchors.margins: UM.Theme.getSize("default_margin").width
Component
{
id: itemDelegate
UM.TooltipArea
{
property var setting: qualitySettings.getItem(styleData.row)
height: childrenRect.height
width: (parent != null) ? parent.width : 0
text: (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
font.strikeout: styleData.column == 1 && quality == Cura.MachineManager.activeQualityId && setting.user_value != ""
font.italic: setting.profile_value_source == "quality_changes" || (quality == Cura.MachineManager.activeQualityId && setting.user_value != "")
opacity: font.strikeout ? 0.5 : 1
color: styleData.textColor
elide: Text.ElideRight
}
}
}
TableViewColumn
{
role: "label"
title: catalog.i18nc("@title:column", "Setting")
width: parent.width * 0.4
delegate: itemDelegate
}
TableViewColumn
{
role: "profile_value"
title: catalog.i18nc("@title:column", "Profile")
width: parent.width * 0.18
delegate: itemDelegate
}
TableViewColumn
{
@ -38,12 +67,14 @@ Tab
title: catalog.i18nc("@title:column", "Current");
visible: quality == Cura.MachineManager.activeQualityId
width: parent.width * 0.18
delegate: itemDelegate
}
TableViewColumn
{
role: "unit"
title: catalog.i18nc("@title:column", "Unit")
width: parent.width * 0.14
delegate: itemDelegate
}
section.property: "category"
@ -55,9 +86,13 @@ Tab
model: Cura.QualitySettingsModel
{
extruderId: base.extruderId != "" ? base.extruderId : ""
id: qualitySettings
extruderId: base.extruderId
extruderDefinition: base.extruderDefinition
quality: base.quality != null ? base.quality : ""
material: base.material != null ? base.material : ""
}
SystemPalette { id: palette }
}
}

42
resources/qml/Preferences/ProfilesPage.qml
View file

@ -15,26 +15,7 @@ UM.ManagementPage
title: catalog.i18nc("@title:tab", "Profiles");
property var extrudersModel: Cura.ExtrudersModel{}
model: UM.InstanceContainersModel
{
filter:
{
var result = { "type": "quality*", "extruder": null };
if(Cura.MachineManager.filterQualityByMachine)
{
result.definition = Cura.MachineManager.activeQualityDefinitionId;
if(Cura.MachineManager.hasMaterials)
{
result.material = Cura.MachineManager.allActiveMaterialIds[Cura.MachineManager.activeMachineId];
}
}
else
{
result.definition = "fdmprinter"
}
return result
}
}
model: Cura.QualityAndUserProfilesModel { }
section.property: "readOnly"
section.delegate: Rectangle
@ -70,7 +51,11 @@ UM.ManagementPage
text: catalog.i18nc("@action:button", "Activate");
iconName: "list-activate";
enabled: base.currentItem != null ? base.currentItem.id != Cura.MachineManager.activeQualityId : false;
onClicked: Cura.MachineManager.setActiveQuality(base.currentItem.id)
onClicked:
{
Cura.MachineManager.setActiveQuality(base.currentItem.id)
currentItem = base.model.getItem(base.objectList.currentIndex) // Refresh the current item.
}
},
// Create button
@ -134,7 +119,7 @@ UM.ManagementPage
text: catalog.i18nc("@action:button", "Export")
iconName: "document-export"
onClicked: exportDialog.open()
enabled: currentItem != null
enabled: currentItem != null && !base.currentItem.readOnly
}
]
@ -223,6 +208,8 @@ UM.ManagementPage
anchors.right: parent.right
anchors.bottom: parent.bottom
currentIndex: ExtruderManager.activeExtruderIndex + 1;
ProfileTab
{
title: catalog.i18nc("@title:tab", "Global Settings");
@ -238,6 +225,7 @@ UM.ManagementPage
{
title: model.name;
extruderId: model.id;
extruderDefinition: model.definition;
quality: base.currentItem != null ? base.currentItem.id : "";
material: Cura.MachineManager.allActiveMaterialIds[model.id]
}
@ -350,18 +338,16 @@ UM.ManagementPage
folder: CuraApplication.getDefaultPath("dialog_profile_path")
onAccepted:
{
var profiles_to_export = [base.currentItem.id]
for(var extruder_nr in base.extrudersModel.items)
{
profiles_to_export.push(ExtruderManager.getQualityChangesIdByExtruderStackId(base.extrudersModel.items[extruder_nr].id))
}
var result = base.model.exportProfile(profiles_to_export, fileUrl, selectedNameFilter)
var containers = Cura.ContainerManager.findInstanceContainers({"type": "quality_changes", "name": base.currentItem.name})
var result = base.model.exportProfile(containers, fileUrl, selectedNameFilter)
if(result && result.status == "error")
{
messageDialog.icon = StandardIcon.Critical
messageDialog.text = result.message
messageDialog.open()
}
// else pop-up Message thing from python code
CuraApplication.setDefaultPath("dialog_profile_path", folder)
}

23
resources/qml/PrintMonitor.qml
View file

@ -20,13 +20,21 @@ Column
simpleNames: true
}
Label
Item
{
text: printerConnected ? connectedPrinter.connectionText : catalog.i18nc("@info:status", "The printer is not connected.")
color: printerConnected && printerAcceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
font: UM.Theme.getFont("default")
wrapMode: Text.WordWrap
width: base.width
width: base.width - 2 * UM.Theme.getSize("default_margin").width
height: childrenRect.height + UM.Theme.getSize("default_margin").height
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
Label
{
text: printerConnected ? connectedPrinter.connectionText : catalog.i18nc("@info:status", "The printer is not connected.")
color: printerConnected && printerAcceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
font: UM.Theme.getFont("default")
wrapMode: Text.WordWrap
width: parent.width
}
}
Loader
@ -87,6 +95,9 @@ Column
{
height: UM.Theme.getSize("setting_control").height
width: base.width - 2 * UM.Theme.getSize("default_margin").width
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
Label
{
width: parent.width * 0.4

24
resources/qml/Settings/SettingCategory.qml
View file

@ -17,6 +17,7 @@ Button {
signal showTooltip(string text);
signal hideTooltip();
signal contextMenuRequested()
signal showAllHiddenInheritedSettings(string category_id)
text: definition.label
iconSource: UM.Theme.getIcon(definition.icon)
@ -25,7 +26,6 @@ Button {
checked: definition.expanded
onClicked: { forceActiveFocus(); definition.expanded ? settingDefinitionsModel.collapse(definition.key) : settingDefinitionsModel.expandAll(definition.key) }
UM.SimpleButton
{
id: settingsButton
@ -57,13 +57,31 @@ Button {
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("setting_preferences_button_margin").width
visible: false //hiddenValuesCount > 0
visible:
{
if(Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0)
{
var children_with_override = Cura.SettingInheritanceManager.getChildrenKeysWithOverride(definition.key)
for(var i = 0; i < children_with_override.length; i++)
{
if(!settingDefinitionsModel.getVisible(children_with_override[i]))
{
return true
}
}
return false
}
return false
}
height: parent.height / 2
width: height
onClicked:
{
base.showAllHiddenInheritedSettings()
settingDefinitionsModel.expandAll(definition.key);
base.checked = true;
base.showAllHiddenInheritedSettings(definition.key);
}
color: UM.Theme.getColor("setting_control_button")

46
resources/qml/Settings/SettingComboBox.qml
View file

@ -87,34 +87,32 @@ SettingItem
}
onActivated: { forceActiveFocus(); propertyProvider.setPropertyValue("value", definition.options[index].key) }
onModelChanged: updateCurrentIndex();
Connections
Binding
{
target: propertyProvider
onPropertiesChanged: control.updateCurrentIndex()
}
function updateCurrentIndex() {
// FIXME this needs to go away once 'resolve' is combined with 'value' in our data model.
var value;
if ((propertyProvider.properties.resolve != "None") && (stackLevel != 0) && (stackLevel != 1)) {
// We have a resolve function. Indicates that the setting is not settable per extruder and that
// we have to choose between the resolved value (default) and the global value
// (if user has explicitly set this).
value = propertyProvider.properties.resolve;
} else {
value = propertyProvider.properties.value;
}
for(var i = 0; i < definition.options.length; ++i) {
if(definition.options[i].key == value) {
currentIndex = i;
return;
target: control
property: "currentIndex"
value:
{
// FIXME this needs to go away once 'resolve' is combined with 'value' in our data model.
var value;
if ((propertyProvider.properties.resolve != "None") && (base.stackLevel != 0) && (base.stackLevel != 1)) {
// We have a resolve function. Indicates that the setting is not settable per extruder and that
// we have to choose between the resolved value (default) and the global value
// (if user has explicitly set this).
value = propertyProvider.properties.resolve;
} else {
value = propertyProvider.properties.value;
}
}
currentIndex = -1;
for(var i = 0; i < control.model.length; ++i) {
if(control.model[i].key == value) {
return i;
}
}
return -1;
}
}
}
}

27
resources/qml/Settings/SettingItem.qml
View file

@ -34,7 +34,7 @@ Item {
signal contextMenuRequested()
signal showTooltip(string text);
signal hideTooltip();
signal showAllHiddenInheritedSettings(string category_id)
property string tooltipText:
{
var affects = settingDefinitionsModel.getRequiredBy(definition.key, "value")
@ -56,12 +56,12 @@ Item {
if(affects_list != "")
{
tooltip += "<br/><b>%1</b>\n<ul>\n%2</ul>".arg(catalog.i18nc("@label", "Affects")).arg(affects_list)
tooltip += "<br/><b>%1</b>\n<ul>\n%2</ul>".arg(catalog.i18nc("@label Header for list of settings.", "Affects")).arg(affects_list)
}
if(affected_by_list != "")
{
tooltip += "<br/><b>%1</b>\n<ul>\n%2</ul>".arg(catalog.i18nc("@label", "Affected By")).arg(affected_by_list)
tooltip += "<br/><b>%1</b>\n<ul>\n%2</ul>".arg(catalog.i18nc("@label Header for list of settings.", "Affected By")).arg(affected_by_list)
}
return tooltip
@ -196,19 +196,9 @@ Item {
// - This setting item uses inherit button at all
// - The type of the value of any deeper container is an "object" (eg; is a function)
visible:
{
var state = base.state == "InstanceState.User";
var has_setting_function = false;
for (var i = 1; i < base.stackLevels.length; i++)
{
has_setting_function = typeof(propertyProvider.getPropertyValue("value", base.stackLevels[i])) == "object";
if(has_setting_function)
{
break;
}
}
return state && base.showInheritButton && has_setting_function && typeof(propertyProvider.getPropertyValue("value", base.stackLevels[0])) != "object"
}
{
return showInheritButton && Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0;
}
height: parent.height;
width: height;
@ -227,10 +217,9 @@ Item {
break;
}
}
if(last_entry == 4 && 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 container) and the first
// 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.
propertyProvider.removeFromContainer(0)
}

2
resources/qml/Settings/SettingTextField.qml
View file

@ -114,7 +114,7 @@ SettingItem
// 3: material -> user changed material in materialspage
// 4: variant
// 5: machine
if ((propertyProvider.properties.resolve != "None") && (stackLevel != 0) && (stackLevel != 1)) {
if ((propertyProvider.properties.resolve != "None" && propertyProvider.properties.resolve) && (stackLevel != 0) && (stackLevel != 1)) {
// We have a resolve function. Indicates that the setting is not settable per extruder and that
// we have to choose between the resolved value (default) and the global value
// (if user has explicitly set this).

14
resources/qml/Settings/SettingView.qml
View file

@ -30,9 +30,10 @@ ScrollView
id: definitionsModel;
containerId: Cura.MachineManager.activeDefinitionId
visibilityHandler: UM.SettingPreferenceVisibilityHandler { }
exclude: ["machine_settings"]
exclude: ["machine_settings", "infill_mesh", "infill_mesh_order"]
expanded: Printer.expandedCategories
onExpandedChanged: Printer.setExpandedCategories(expanded)
onVisibilityChanged: Cura.SettingInheritanceManager.forceUpdate()
}
delegate: Loader
@ -136,6 +137,8 @@ ScrollView
key: model.key ? model.key : ""
watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ]
storeIndex: 0
// Due to the way setPropertyValue works, removeUnusedValue gives the correct output in case of resolve
removeUnusedValue: model.resolve == undefined
}
Connections
@ -149,6 +152,15 @@ ScrollView
}
onShowTooltip: base.showTooltip(delegate, { x: 0, y: delegate.height / 2 }, text)
onHideTooltip: base.hideTooltip()
onShowAllHiddenInheritedSettings:
{
var children_with_override = Cura.SettingInheritanceManager.getChildrenKeysWithOverride(category_id)
for(var i = 0; i < children_with_override.length; i++)
{
definitionsModel.setVisible(children_with_override[i], true)
}
Cura.SettingInheritanceManager.manualRemoveOverride(category_id)
}
}
}

9
resources/qml/Sidebar.qml
View file

@ -186,20 +186,21 @@ Rectangle
Label {
id: settingsModeLabel
text: catalog.i18nc("@label:listbox","Print Setup");
text: catalog.i18nc("@label:listbox", "Print Setup");
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width;
anchors.top: headerSeparator.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height
width: parent.width/100*45
width: parent.width * 0.45 - 2 * UM.Theme.getSize("default_margin").width
font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text")
visible: !monitoringPrint
elide: Text.ElideRight
}
Rectangle {
id: settingsModeSelection
width: parent.width/100*55
width: parent.width * 0.55
height: UM.Theme.getSize("sidebar_header_mode_toggle").height
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
@ -262,7 +263,7 @@ Rectangle
anchors.leftMargin: UM.Theme.getSize("default_margin").width;
anchors.top: headerSeparator.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height
width: parent.width/100*45
width: parent.width * 0.45
font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text")
visible: monitoringPrint

4
resources/qml/SidebarHeader.qml
View file

@ -244,6 +244,8 @@ Column
}
}
property var valueWarning: ! Cura.MachineManager.isActiveQualitySupported
enabled: !extrudersList.visible || base.currentExtruderIndex > -1
height: UM.Theme.getSize("setting_control").height
@ -290,7 +292,7 @@ Column
height: UM.Theme.getSize("setting_control").height
tooltip: Cura.MachineManager.activeQualityName
style: UM.Theme.styles.sidebar_header_button
property var valueWarning: Cura.MachineManager.activeQualityId == "empty_quality"
property var valueWarning: ! Cura.MachineManager.isActiveQualitySupported
menu: ProfileMenu { }
UM.SimpleButton

2
resources/quality/high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = fdmprinter
[metadata]
type = quality
quality_type = high
weight = -3
weight = 1
[values]
layer_height = 0.06

2
resources/quality/normal.inst.cfg
View file

@ -6,6 +6,6 @@ definition = fdmprinter
[metadata]
type = quality
quality_type = normal
weight = -2
weight = 0
[values]

2
resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pla_ultimaker2_plus_0.25_mm
weight = -2
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pla_ultimaker2_plus_0.4_mm
weight = -3
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pla_ultimaker2_plus_0.4_mm
weight = -2
weight = 0
quality_type = normal
[values]

2
resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
material = generic_pla_ultimaker2_plus_0.6_mm
type = quality
weight = -2
weight = 0
quality_type = normal
[values]

2
resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
material = generic_pla_ultimaker2_plus_0.8_mm
type = quality
weight = -2
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_abs_ultimaker2_plus_0.25_mm
weight = -2
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_abs_ultimaker2_plus_0.4_mm
weight = -3
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_abs_ultimaker2_plus_0.4_mm
weight = -2
weight = 0
quality_type = normal
[values]

2
resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_abs_ultimaker2_plus_0.6_mm
weight = -2
weight = 0
quality_type = normal
[values]

2
resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_abs_ultimaker2_plus_0.8_mm
weight = -2
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_ultimaker2_plus_0.25_mm
weight = -2
weight = -1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_ultimaker2_plus_0.4_mm
weight = -3
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_ultimaker2_plus_0.4_mm
weight = -2
weight = 0
quality_type = normal
[values]

2
resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_ultimaker2_plus_0.6_mm
weight = -2
weight = 0
quality_type = normal
[values]

2
resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_ultimaker2_plus_0.8_mm
weight = -2
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_plus_ultimaker2_plus_0.4_mm
weight = 0
weight = -2
quality_type = draft
[values]

2
resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_plus_ultimaker2_plus_0.6_mm
weight = 0
weight = -2
quality_type = draft
[values]

2
resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_plus_ultimaker2_plus_0.8_mm
weight = 0
weight = -2
quality_type = draft
[values]

2
resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_nylon_ultimaker2_plus_0.25_mm
weight = 0
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_nylon_ultimaker2_plus_0.4_mm
weight = 0
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_nylon_ultimaker2_plus_0.6_mm
weight = 0
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_nylon_ultimaker2_plus_0.8_mm
weight = 0
weight = -2
quality_type = draft
[values]

2
resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pc_ultimaker2_plus_0.25_mm
weight = 0
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pc_ultimaker2_plus_0.4_mm
weight = 0
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pc_ultimaker2_plus_0.6_mm
weight = 0
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pc_ultimaker2_plus_0.8_mm
weight = 0
weight = -2
quality_type = draft
[values]

2
resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_tpu_ultimaker2_plus_0.25_mm
weight = 0
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_tpu_ultimaker2_plus_0.6_mm
weight = 0
weight = -1
quality_type = fast
[values]

BIN
resources/themes/cura/fonts/OpenSans-ExtraBold.ttf
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/OpenSans-ExtraBoldItalic.ttf
View file

Binary file not shown.

3384
resources/themes/cura/icons/application.svg
View file

File diff suppressed because it is too large Load diff
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 246 KiB

After

Width:  |  Height:  |  Size: 371 B

Before After
Before After

10
resources/themes/cura/icons/arrow_bottom.svg
View file

@ -1,7 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
x="0px" y="0px" viewBox="0 0 10 10" xml:space="preserve">
<path d="M8.4,2.7c0.3-0.3,0.7-0.3,1,0c0.3,0.3,0.3,0.7,0,1L5.4,7.5c-0.3,0.3-0.7,0.3-1,0L0.6,3.6c-0.3-0.3-0.3-0.7,0-1
c0.3-0.3,0.7-0.3,1,0L5,5.8L8.4,2.7z"/>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
<path d="M8.4 2.7c.3-.3.7-.3 1 0 .3.3.3.7 0 1l-4 3.8c-.3.3-.7.3-1 0L.6 3.6c-.3-.3-.3-.7 0-1 .3-.3.7-.3 1 0L5 5.8l3.4-3.1z"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 493 B

After

Width:  |  Height:  |  Size: 197 B

Before After
Before After

10
resources/themes/cura/icons/arrow_left.svg
View file

@ -1,7 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
x="0px" y="0px" viewBox="0 0 10 10" xml:space="preserve">
<path d="M7.4,8.5c0.3,0.3,0.3,0.7,0,1c-0.3,0.3-0.7,0.3-1,0L2.6,5.6c-0.3-0.3-0.3-0.7,0-1l3.8-3.9c0.3-0.3,0.7-0.3,1,0
c0.3,0.3,0.3,0.7,0,1L4.2,5.1L7.4,8.5z"/>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
<path d="M7.4 8.5c.3.3.3.7 0 1-.3.3-.7.3-1 0L2.6 5.6c-.3-.3-.3-.7 0-1L6.4.7c.3-.3.7-.3 1 0 .3.3.3.7 0 1L4.2 5.1l3.2 3.4z"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 495 B

After

Width:  |  Height:  |  Size: 196 B

Before After
Before After

10
resources/themes/cura/icons/arrow_right.svg
View file

@ -1,7 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
x="0px" y="0px" viewBox="0 0 10 10" xml:space="preserve">
<path d="M2.6,1.7c-0.3-0.3-0.3-0.7,0-1c0.3-0.3,0.7-0.3,1,0l3.8,3.9c0.3,0.3,0.3,0.7,0,1L3.5,9.5c-0.3,0.3-0.7,0.3-1,0
c-0.3-0.3-0.3-0.7,0-1l3.1-3.4L2.6,1.7z"/>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
<path d="M2.6 1.7c-.3-.3-.3-.7 0-1 .3-.3.7-.3 1 0l3.8 3.9c.3.3.3.7 0 1L3.5 9.5c-.3.3-.7.3-1 0-.3-.3-.3-.7 0-1l3.1-3.4-3-3.4z"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 496 B

After

Width:  |  Height:  |  Size: 200 B

Before After
Before After

Some files were not shown because too many files have changed in this diff Show more