Merge branch 'master' of github.com:Ultimaker/Cura into sentry_crash_integration

This commit is contained in:
Jaime van Kessel 2019-12-16 11:28:04 +01:00
commit 4de28bed28
No known key found for this signature in database
GPG key ID: 3710727397403C91
1251 changed files with 1842 additions and 1456 deletions

View file

@ -88,7 +88,7 @@
"adhesion_type": { "default_value": "skirt" },
"machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"gantry_height": { "value": "55" },
"machine_max_feedrate_x": { "default_value": 300 },
"machine_max_feedrate_y": { "default_value": 300 },

View file

@ -88,7 +88,7 @@
"adhesion_type": { "default_value": "skirt" },
"machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"gantry_height": { "value": "55" },
"machine_max_feedrate_x": { "default_value": 300 },
"machine_max_feedrate_y": { "default_value": 300 },

View file

@ -87,7 +87,7 @@
"adhesion_type": { "default_value": "skirt" },
"machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"gantry_height": { "value": "55" },
"machine_max_feedrate_x": { "default_value": 300 },
"machine_max_feedrate_y": { "default_value": 300 },

View file

@ -7,13 +7,6 @@
"machine_width": { "default_value": 300 },
"machine_depth": { "default_value": 300 },
"machine_height": { "default_value": 400 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

View file

@ -8,13 +8,6 @@
"machine_width": { "default_value": 450 },
"machine_depth": { "default_value": 450 },
"machine_height": { "default_value": 470 },
"machine_head_polygon": { "default_value": [
[-44, 34],
[-44, -34],
[18, -34],
[18, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-44, 34],
[-44, -34],

View file

@ -7,13 +7,6 @@
"machine_width": { "default_value": 300 },
"machine_depth": { "default_value": 220 },
"machine_height": { "default_value": 300 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

View file

@ -7,13 +7,6 @@
"machine_width": { "default_value": 400 },
"machine_depth": { "default_value": 400 },
"machine_height": { "default_value": 400 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

View file

@ -7,13 +7,6 @@
"machine_width": { "default_value": 500 },
"machine_depth": { "default_value": 500 },
"machine_height": { "default_value": 500 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

View file

@ -5,13 +5,6 @@
"overrides": {
"machine_name": { "default_value": "Creality CR-10S Pro" },
"machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"},
"machine_head_polygon": { "default_value": [
[-44, 34],
[-44, -34],
[18, -34],
[18, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-44, 34],
[-44, -34],

View file

@ -7,13 +7,6 @@
"machine_width": { "default_value": 220 },
"machine_depth": { "default_value": 220 },
"machine_height": { "default_value": 250 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

View file

@ -8,13 +8,6 @@
"machine_width": { "default_value": 150 },
"machine_depth": { "default_value": 150 },
"machine_height": { "default_value": 200 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

View file

@ -9,16 +9,14 @@
},
"overrides": {
"machine_name": { "default_value": "Creality Ender-3" },
"machine_width": { "default_value": 220 },
"machine_depth": { "default_value": 220 },
"machine_width": { "default_value": 235 },
"machine_depth": { "default_value": 235 },
"machine_height": { "default_value": 250 },
"machine_head_polygon": { "default_value": [
[-1, 1],
[-1, -1],
[1, -1],
[1, 1]
]
},
"machine_disallowed_areas": {
"default_value": [
[[-117.5, 117.5], [-117.5, 108], [117.5, 108], [117.5, 117.5]],
[[-117.5, -108], [-117.5, -117.5], [117.5, -117.5], [117.5, -108]]
]},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],
@ -26,7 +24,10 @@
[32, 34]
]
},
"machine_start_gcode": {
"default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish"
},
"gantry_height": { "value": 25 }
}
}
}

View file

@ -7,13 +7,6 @@
"machine_width": { "default_value": 452 },
"machine_depth": { "default_value": 468 },
"machine_height": { "default_value": 482 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

View file

@ -8,13 +8,6 @@
"machine_width": { "default_value": 220 },
"machine_depth": { "default_value": 220 },
"machine_height": { "default_value": 300 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

View file

@ -8,13 +8,6 @@
"machine_width": { "default_value": 350 },
"machine_depth": { "default_value": 350 },
"machine_height": { "default_value": 400 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

View file

@ -6,7 +6,7 @@
"type": "extruder",
"author": "Ultimaker",
"manufacturer": "Unknown",
"setting_version": 10,
"setting_version": 11,
"visible": false,
"position": "0"
},

View file

@ -7,7 +7,7 @@
"author": "Ultimaker",
"category": "Other",
"manufacturer": "Unknown",
"setting_version": 10,
"setting_version": 11,
"file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",
"visible": false,
"has_materials": true,
@ -421,34 +421,6 @@
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_head_polygon":
{
"label": "Machine Head Polygon",
"description": "A 2D silhouette of the print head (fan caps excluded).",
"type": "polygon",
"default_value":
[
[
-1,
1
],
[
-1,
-1
],
[
1,
-1
],
[
1,
1
]
],
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_head_with_fans_polygon":
{
"label": "Machine Head & Fan Polygon",
@ -2101,6 +2073,36 @@
"settable_per_mesh": true
}
}
},
"skin_edge_support_thickness":
{
"label": "Skin Edge Support Thickness",
"description": "The thickness of the extra infill that supports skin edges.",
"unit": "mm",
"default_value": 0.8,
"minimum_value": "0",
"maximum_value": "machine_height",
"type": "float",
"value": "0",
"comment": "This was put at 0 to keep the default behaviour the same, but in the original PR the 'value' was: resolveOrValue('infill_sparse_thickness') * (4 if infill_sparse_density < 12.5 else (3 if infill_sparse_density < 25 else (2 if infill_sparse_density < 50 else 1)))",
"limit_to_extruder": "infill_extruder_nr",
"enabled": "infill_sparse_density > 0",
"settable_per_mesh": true,
"children":
{
"skin_edge_support_layers":
{
"label": "Skin Edge Support Layers",
"description": "The number of infill layers that supports skin edges.",
"default_value": 4,
"minimum_value": "0",
"type": "int",
"value": "math.ceil(round(skin_edge_support_thickness / resolveOrValue('infill_sparse_thickness'), 4))",
"limit_to_extruder": "infill_extruder_nr",
"enabled": "infill_sparse_density > 0",
"settable_per_mesh": true
}
}
}
}
},
@ -2365,6 +2367,20 @@
"settable_per_mesh": false,
"settable_per_extruder": true
},
"material_break_preparation_temperature":
{
"label": "Break Preparation Temperature",
"description": "The temperature used to purge material, should be roughly equal to the highest possible printing temperature.",
"type": "float",
"unit": "°C",
"default_value": 50,
"value": "material_print_temperature",
"enabled": false,
"minimum_value": "-273.15",
"maximum_value_warning": "300",
"settable_per_mesh": false,
"settable_per_extruder": true
},
"material_break_retracted_position":
{
"label": "Break Retracted Position",
@ -2723,7 +2739,6 @@
"minimum_value": "0",
"minimum_value_warning": "line_width * 1.5",
"maximum_value_warning": "10",
"enabled": false,
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -7151,6 +7166,17 @@
"enabled": "bridge_settings_enabled",
"settable_per_mesh": true
},
"bridge_sparse_infill_max_density":
{
"label": "Bridge Sparse Infill Max Density",
"description": "Maximum density of infill considered to be sparse. Skin over sparse infill is considered to be unsupported and so may be treated as a bridge skin.",
"unit": "%",
"type": "float",
"default_value": 0,
"minimum_value": "0",
"enabled": "bridge_settings_enabled",
"settable_per_mesh": true
},
"bridge_wall_coast":
{
"label": "Bridge Wall Coasting",

View file

@ -59,14 +59,6 @@
"adhesion_type": {
"default_value": "skirt"
},
"machine_head_polygon": {
"default_value": [
[-75, 35],
[18, 35],
[18, -18],
[-75, -18]
]
},
"machine_head_with_fans_polygon": {
"default_value": [
[-75, 35],

View file

@ -28,7 +28,7 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-75, -18],
[-75, 35],

View file

@ -32,7 +32,7 @@
"machine_center_is_zero": {
"default_value": true
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-43.7, -19.2],
[-43.7, 55],

View file

@ -32,7 +32,7 @@
"machine_depth": {
"default_value": 150
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-30, 34],
[-30, -32],

View file

@ -32,7 +32,7 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-75, -18],
[-75, 35],

View file

@ -32,7 +32,7 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-75, -18],
[-75, 35],

View file

@ -34,7 +34,7 @@
"machine_depth": {
"default_value": 300
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-30, 34],
[-30, -32],

View file

@ -32,7 +32,7 @@
"machine_depth": {
"default_value": 150
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-30, 34],
[-30, -32],

View file

@ -31,14 +31,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"default_value": [
[-75, -18],
[-75, 35],
[18, 35],
[18, -18]
]
},
"machine_head_with_fans_polygon": {
"default_value": [
[-75, -18],

View file

@ -31,7 +31,7 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-75, -18],
[-75, 35],

View file

@ -16,7 +16,7 @@
},
"overrides": {
"machine_head_polygon": { "default_value": [[ 0, 0], [ 0, 0], [ 0, 0], [ 0, 0]] },
"machine_head_with_fans_polygon": { "default_value": [[ 0, 0], [ 0, 0], [ 0, 0], [ 0, 0]] },
"prime_tower_size": { "default_value": 8.660254037844387 },
"layer_height": { "default_value": 0.2 },
"speed_print": { "default_value": 40 },

View file

@ -21,7 +21,7 @@
"machine_end_gcode": {
"default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n"
},
"machine_head_polygon": { "default_value": [[ 22, 67], [ 22, 51], [ 36, 51], [ 36, 67]] },
"machine_head_with_fans_polygon": { "default_value": [[ 22, 67], [ 22, 51], [ 36, 51], [ 36, 67]] },
"skirt_gap": { "default_value": 5.0 },
"cool_min_layer_time": { "default_value": 10 },
"prime_tower_size": { "default_value": 7.745966692414834 },

View file

@ -21,7 +21,7 @@
"machine_end_gcode": {
"default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn extruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n"
},
"machine_head_polygon": { "default_value": [[ 18, 0], [ 18, 65], [ 32, 65], [ 32, 0]] },
"machine_head_with_fans_polygon": { "default_value": [[ 18, 0], [ 18, 65], [ 32, 65], [ 32, 0]] },
"cool_min_layer_time": { "default_value": 10 },
"prime_tower_size": { "default_value": 7.745966692414834 },
"skirt_gap": { "default_value": 5.0 },

View file

@ -15,7 +15,7 @@
},
"overrides": {
"machine_head_polygon": { "default_value": [[ 16, 30], [ 16, 45], [ 16, 45], [ 16, 30]] },
"machine_head_with_fans_polygon": { "default_value": [[ 16, 30], [ 16, 45], [ 16, 45], [ 16, 30]] },
"prime_tower_size": { "default_value": 8.660254037844387 },
"skirt_gap": { "default_value": 5.0 },
"cool_min_layer_time": { "default_value": 15 },

View file

@ -21,7 +21,7 @@
"machine_end_gcode": {
"default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n"
},
"machine_head_polygon": { "default_value": [[ 40, 15], [ 40, 60], [ 30, 60], [ 30, 15]] },
"machine_head_with_fans_polygon": { "default_value": [[ 40, 15], [ 40, 60], [ 30, 60], [ 30, 15]] },
"support_pattern": { "default_value": "grid" },
"cool_min_layer_time": { "default_value": 10 },
"support_angle": { "default_value": 45 },

View file

@ -23,7 +23,7 @@
"machine_height": { "default_value": 200 },
"machine_depth": { "default_value": 200 },
"machine_center_is_zero": { "default_value": false },
"machine_head_polygon":
"machine_head_with_fans_polygon":
{
"default_value":
[

View file

@ -28,7 +28,7 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-30, 34],
[-30, -32],

View file

@ -35,14 +35,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"default_value": [
[-60, -18],
[-60, 40],
[18, 40],
[18, -18]
]
},
"machine_head_with_fans_polygon": {
"default_value": [
[-60, -40],
@ -58,10 +50,10 @@
"default_value": "RepRap (Marlin/Sprinter)"
},
"machine_start_gcode": {
"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
"default_value": "M104 T0 S{material_print_temperature_layer_0}\nG28 ;Home extruder\nG90 ;Absolute positioning\nM82 ;Extruder in absolute mode\nG1 Z1 F100\nG92 E0 ;Reset extruder position\nM109 T0 S{material_print_temperature_layer_0}\nG1 E20 F100\nG92 E0 ;Reset extruder position"
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
"default_value": "G1 X0 Y0 Z130 ;Get extruder out of way\nM107 ;Turn off fan\n;Disable all extruders\nG91 ;Relative positioning\nT0\nG1 E-1 ;Reduce filament pressure\nM104 T0 S0\nG90 ;Absolute positioning\nG92 E0 ;Reset extruder position\nM140 S0 ;Disable heated bed\nM84 ;Turn steppers off"
}
}
}

View file

@ -36,14 +36,6 @@
"machine_use_extruder_offset_to_offset_coords": {
"default_value": true
},
"machine_head_polygon": {
"default_value": [
[-60, -18],
[-60, 40],
[18, 40],
[18, -18]
]
},
"machine_head_with_fans_polygon": {
"default_value": [
[-60, -40],

View file

@ -2890,7 +2890,7 @@ msgstr "Coste del filamento"
#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276
msgctxt "@label"
msgid "Filament weight"
msgstr "Anchura del filamento"
msgstr "Peso del filamento"
#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294
msgctxt "@label"

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View file

@ -4,7 +4,7 @@ name = Quick
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = quick
quality_type = draft

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = fast
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = high
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = normal
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Quick
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = quick
quality_type = draft

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = fast
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = high
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = normal
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Quick
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = quick
quality_type = draft

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = fast
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = high
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s3
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = normal
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Quick
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = quick
quality_type = draft

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = fast
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = high
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = normal
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Quick
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = quick
quality_type = draft

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = fast
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = high
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = normal
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Quick
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = quick
quality_type = draft

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = engineering
quality_type = fast

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = fast
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = high
intent_category = visual

View file

@ -4,7 +4,7 @@ name = Accurate
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
intent_category = engineering
quality_type = normal

View file

@ -4,7 +4,7 @@ name = Visual
definition = ultimaker_s5
[metadata]
setting_version = 10
setting_version = 11
type = intent
quality_type = normal
intent_category = visual

View file

@ -21,7 +21,8 @@ UM.MainWindow
id: base
// Cura application window title
title: catalog.i18nc("@title:window", "Ultimaker Cura")
title: PrintInformation.jobName + " - " + catalog.i18nc("@title:window", CuraApplication.applicationDisplayName)
backgroundColor: UM.Theme.getColor("viewport_background")
UM.I18nCatalog

View file

@ -12,7 +12,7 @@ UM.Dialog
id: base
//: About dialog title
title: catalog.i18nc("@title:window","About Cura")
title: catalog.i18nc("@title:window","About " + catalog.i18nc("@title:window", CuraApplication.applicationDisplayName))
minimumWidth: 500 * screenScaleFactor
minimumHeight: 650 * screenScaleFactor

View file

@ -177,6 +177,7 @@ UM.Dialog
return catalog.i18nc("@action:label", "Extruder %1").arg(extruder_id)
}
font.bold: true
enabled: modelData.isEnabled
}
Row
{
@ -194,6 +195,7 @@ UM.Dialog
return catalog.i18nc("@action:label", "Material")
}
width: Math.floor(scroll.width / 3) | 0
enabled: modelData.isEnabled
}
Label
{
@ -205,7 +207,7 @@ UM.Dialog
}
return materialName
}
enabled: modelData.isEnabled
width: Math.floor(scroll.width / 3) | 0
}
}

View file

@ -83,10 +83,22 @@ Item
text: PrintInformation.jobName
horizontalAlignment: TextInput.AlignLeft
property string textBeforeEdit: ""
onActiveFocusChanged:
{
if (activeFocus)
{
textBeforeEdit = text
}
}
onEditingFinished:
{
var new_name = text == "" ? catalog.i18nc("@text Print job name", "Untitled") : text
PrintInformation.setJobName(new_name, true)
if (text != textBeforeEdit) {
var new_name = text == "" ? catalog.i18nc("@text Print job name", "Untitled") : text
PrintInformation.setJobName(new_name, true)
}
printJobTextfield.focus = false
}

View file

@ -164,6 +164,7 @@ Popup
visible: profilesList.visibleChildren.length > 1
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
color: UM.Theme.getColor("text_inactive")
}
Column

View file

@ -13,7 +13,8 @@ Item
property color activeColor: UM.Theme.getColor("primary")
property color inactiveColor: UM.Theme.getColor("slider_groove")
property color defaultItemColor: UM.Theme.getColor("small_button_active")
property color defaultItemColor: UM.Theme.getColor("slider_groove_fill")
property color defaultItemFillColor: UM.Theme.getColor("main_background")
property int checkboxSize: Math.round(UM.Theme.getSize("radio_button").height * 0.75)
property int inactiveMarkerSize: 2 * barSize
property int barSize: UM.Theme.getSize("slider_groove_radius").height
@ -135,6 +136,7 @@ Item
radius: Math.round(width / 2)
border.color: defaultItemColor
color: defaultItemFillColor
Rectangle
{

View file

@ -4,7 +4,7 @@ name = Standard
definition = leapfrog_bolt_pro
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = standard
weight = 0

View file

@ -4,7 +4,7 @@ name = Standard
definition = leapfrog_bolt_pro
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = standard
weight = 0

View file

@ -4,7 +4,7 @@ name = Standard
definition = leapfrog_bolt_pro
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = standard
weight = 0

View file

@ -4,7 +4,7 @@ name = Standard
definition = leapfrog_bolt_pro
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = standard
weight = 0

View file

@ -4,7 +4,7 @@ name = Standard
definition = leapfrog_bolt_pro
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = standard
weight = 0

View file

@ -4,7 +4,7 @@ name = Standard
definition = leapfrog_bolt_pro
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = standard
weight = 0

View file

@ -4,7 +4,7 @@ name = Standard
definition = leapfrog_bolt_pro
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = standard
weight = 0

View file

@ -4,7 +4,7 @@ name = Fine
definition = abax_pri3
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Extra Fine
definition = abax_pri3
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Fine
definition = abax_pri3
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Fine
definition = abax_pri5
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Extra Fine
definition = abax_pri5
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Fine
definition = abax_pri5
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Fine
definition = abax_titan
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Extra Fine
definition = abax_titan
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Fine
definition = abax_titan
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_4max
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = draft
weight = -2

View file

@ -4,7 +4,7 @@ name = High
definition = anycubic_4max
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_4max
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_4max
[metadata]
setting_version = 10
setting_version = 11
type = quality
quality_type = draft
weight = -2

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