3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'Ultimaker:master' into master

Browse source
This commit is contained in:
x40-Community 2021-07-25 12:52:10 +02:00 • committed by GitHub
commit 48989aa5c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 998 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/definitions/anycubic_i3_mega_s.def.json
View file

@ -115,6 +115,7 @@
"skirt_gap": { "value": 5.0 },
"skirt_line_count": { "value": 4 },
"meshfix_maximum_deviation": { "value": 0.05 },
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },
"support_pattern": { "value": "'zigzag'" },

1
resources/definitions/anycubic_kossel_linear_plus.def.json
View file

@ -5,6 +5,7 @@
"metadata": {
"visible": true,
"platform": "kossel_pro_build_platform.3mf",
"platform_offset": [0, -0.25, 0],
"machine_extruder_trains": {
"0": "anycubic_kossel_extruder_0"
}

35
resources/definitions/atom2.def.json Normal file
View file

@ -0,0 +1,35 @@
{
"name": "Atom 2",
"version": 2,
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "Victor (Yu Chieh) Lin",
"manufacturer": "Layer One",
"file_formats": "text/x-gcode",
"platform_offset": [0,0,0],
"machine_extruder_trains": { "0": "atom2_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Atom 2" },
"machine_shape": { "default_value": "elliptic" },
"machine_width": { "default_value": 210 },
"machine_depth": { "default_value": 210 },
"machine_height": { "default_value": 320 },
"machine_extruder_count": { "default_value": 1 },
"machine_heated_bed": { "default_value": false },
"machine_center_is_zero": { "default_value": true },
"machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" },
"machine_end_gcode": { "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" },
"layer_height": { "default_value": 0.2 },
"default_material_print_temperature": { "default_value": 210 },
"speed_print": { "default_value": 32 },
"optimize_wall_printing_order": { "value": "True" },
"infill_sparse_density": { "default_value": 10 },
"brim_width": { "default_value": 4 }
}
}

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

@ -85,8 +85,8 @@
"material_flow": { "value": 100 },
"travel_compensate_overlapping_walls_0_enabled": { "value": "False" },
"z_seam_type": { "value": "'back'" },
"z_seam_corner": { "value": "'z_seam_corner_weighted'" },
"z_seam_type": { "value": "'sharpest_corner'" },
"z_seam_corner": { "value": "'z_seam_corner_inner'" },
"infill_line_width": { "value": "line_width * 1.2" },
"infill_sparse_density": { "value": "20" },
@ -156,7 +156,7 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_density": { "value": 33.333 },
"support_interface_density": { "value": 75 },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"minimum_support_area": { "value": 2 },

51
resources/definitions/biqu_bx_abl.def.json Executable file
View file

@ -0,0 +1,51 @@
{
"name": "Biqu BX",
"version": 2,
"inherits": "biqu_base",
"metadata": {
"quality_definition": "biqu_base",
"visible": true,
"has_machine_materials": true,
"platform": "BIQU_BX_PLATE.stl",
"platform_offset": [
7,
-7.4,
-3
]
},
"overrides": {
"coasting_enable": { "value": false },
"retraction_amount": { "value": 1 },
"retraction_speed": { "value": 40 },
"retraction_extrusion_window": { "value": 1 },
"retract_at_layer_change": { "value": true },
"support_enable": { "value": false },
"support_structure": { "value": "'normal'" },
"support_type": { "value": "'buildplate'" },
"support_angle": { "value": 45 },
"support_infill_rate": { "value": 15 },
"infill_overlap": { "value": 15.0 },
"skin_overlap": { "value": 20.0 },
"fill_outline_gaps": { "value": true },
"filter_out_tiny_gaps": { "value": true },
"roofing_layer_count": { "value": 2 },
"xy_offset_layer_0": { "value": -0.1 },
"speed_print": { "value": 50 },
"machine_name": { "default_value": "Biqu BX" },
"machine_width": { "value": 250 },
"machine_depth": { "value": 250 },
"machine_height": { "value": 250 },
"machine_head_with_fans_polygon": { "default_value": [
[-33, 35],
[-33, -23],
[33, -23],
[33, 35]
]
},
"machine_start_gcode": {
"default_value": "; BIQU BX Start G-code\r\n; For inforation on how to tune this profile and get the\r\n; most out of your BX visit: https:\/\/github.com\/looxonline\/Marlin\r\n; For the official github site visit: https:\/\/github.com\/bigtreetech\/BIQU-BX\r\n\r\nM117 Initial homing sequence. ; Home so that the probe is positioned to heat\r\nG28\r\n\r\nM117 Probe heating position\r\nG0 X65 Y5 Z1 ; Move the probe to the heating position.\r\n\r\nM117 Getting the heaters up to temp!\r\nM104 S140 ; Set Extruder temperature, no wait\r\nM140 S60 ; Set Heat Bed temperature\r\nM190 S60 ; Wait for Heat Bed temperature\r\n\r\nM117 Waiting for probe to warm! ; Wait another 90s for the probe to absorb heat.\r\nG4 S90 \r\n\r\nM117 Post warming re-home\r\nG28 ; Home all axes again after warming\r\n\r\nM117 Z-Dance of my people\r\nG34\r\n\r\nM117 ABL Probing\r\nG29\r\n\r\nM900 K0 L0 T0 ;Edit the K and L values if you have calibrated a k factor for your filament\r\nM900 T0 S0\r\n\r\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\r\nG1 X4.1 Y10 Z0.3 F5000.0 ; Move to start position\r\n\r\nM117 Getting the extruder up to temp\r\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\r\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\r\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\r\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\r\n\r\nG92 E0 ; Reset Extruder\r\nM117 Purging\r\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\r\nG1 X4.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\r\nG1 X4.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\r\nG92 E0 ; Reset Extruder\r\nM117 Lets make\r\nG1 X8 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish"
},
"gantry_height": { "value": 27.5 }
}
}

76
resources/definitions/flsun_sr.def.json Normal file
View file

@ -0,0 +1,76 @@
{
"version": 2,
"name": "FlSun SuperRacer",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "Thushan Fernando",
"manufacturer": "Flsun",
"platform": "flsun_sr.3mf",
"file_formats": "text/x-gcode",
"has_materials": true,
"has_machine_quality": false,
"preferred_quality_type": "fast",
"machine_extruder_trains": {
"0": "flsun_sr_extruder_0"
}
},
"overrides": {
"machine_extruder_count": {
"default_value": 1
},
"retraction_enable": {
"default_value": true
},
"machine_heated_bed": {
"default_value": true
},
"machine_width": {
"default_value": 260
},
"machine_depth": {
"default_value": 260
},
"machine_height": {
"default_value": 330
},
"machine_center_is_zero": {
"default_value": true
},
"machine_head_with_fans_polygon": {
"default_value": [
[0, 0],
[0, 0],
[0, 0],
[0, 0]
]
},
"z_seam_type": {
"value": "'back'"
},
"gantry_height": {
"value": "0"
},
"machine_shape": {
"default_value": "elliptic"
},
"machine_nozzle_size": {
"default_value": 0.4
},
"material_diameter": {
"default_value": 1.75
},
"infill_sparse_density": {
"default_value": 15
},
"machine_start_gcode": {
"default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"
},
"machine_end_gcode": {
"default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 F6000\nG28 X0 Y0\nG90 ;absolute positioning\n"
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
}
}
}

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

@ -4,7 +4,7 @@
"inherits": "fdmprinter",
"metadata": {
"author": "William & Cataldo URSO",
"manufacturer": "Shenzhen Geeetech Technology",
"manufacturer": "Geeetech",
"file_formats": "text/x-gcode",
"visible": true,
"has_materials": true,

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

@ -3,7 +3,7 @@
"name": "MP Mini Delta",
"inherits": "fdmprinter",
"metadata": {
"author": "MPMD Facebook Group",
"author": "MPMD V1 Facebook Group",
"manufacturer": "Monoprice",
"file_formats": "text/x-gcode",
"platform": "mp_mini_delta_platform.3mf",
@ -25,7 +25,7 @@
"overrides": {
"machine_start_gcode":
{
"default_value": ";MPMD Basic Calibration Tutorial: \n; https://www.thingiverse.com/thing:3892011 \n; \n; If you want to put calibration values in your \n; Start Gcode, put them here. \n; \n;If on stock firmware, at minimum, consider adding \n;M665 R here since there is a firmware bug. \n; \n; Calibration part ends here \n; \nG90 ; switch to absolute positioning \nG92 E0 ; reset extrusion distance \nG1 E20 F200 ; purge 20mm of filament to prime nozzle. \nG92 E0 ; reset extrusion distance \nG4 S5 ; Pause for 5 seconds to allow time for removing extruded filament \nG28 ; start from home position \nG1 E-6 F900 ; retract 6mm of filament before starting the bed leveling process \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for removing extruded filament \nG29 P2 Z0.28 ; Auto-level ; ADJUST Z higher or lower to set first layer height. Start with 0.02 adjustments. \nG1 Z30 ; raise Z 30mm to prepare for priming the nozzle \nG1 E5 F200 ; extrude 5mm of filament to help prime the nozzle just prior to the start of the print \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for cleaning the nozzle and build plate if needed "
"default_value": ";MPMD V1 Basic Calibration Tutorial: \n; https://www.thingiverse.com/thing:3892011 \n; \n; If you want to put calibration values in your \n; Start Gcode, put them here. \n; \n;If on stock firmware, at minimum, consider adding \n;M665 R here since there is a firmware bug. \n; \n; Calibration part ends here \n; \nG90 ; switch to absolute positioning \nG92 E0 ; reset extrusion distance \nG1 E20 F200 ; purge 20mm of filament to prime nozzle. \nG92 E0 ; reset extrusion distance \nG4 S5 ; Pause for 5 seconds to allow time for removing extruded filament \nG28 ; start from home position \nG1 E-6 F900 ; retract 6mm of filament before starting the bed leveling process \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for removing extruded filament \nG29 P2 Z0.28 ; Auto-level ; ADJUST Z higher or lower to set first layer height. Start with 0.02 adjustments. \nG1 Z30 ; raise Z 30mm to prepare for priming the nozzle \nG1 E5 F200 ; extrude 5mm of filament to help prime the nozzle just prior to the start of the print \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for cleaning the nozzle and build plate if needed "
},
"machine_end_gcode":
{
@ -47,9 +47,9 @@
"default_value": 0.21
},
"material_bed_temperature": { "value": 40 },
"line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
"material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
"material_bed_temperature_layer_0": { "value": "material_bed_temperature + 5" },
"line_width": { "value": "round(machine_nozzle_size, 2)" },
"material_print_temperature_layer_0": { "value": "material_print_temperature" },
"material_bed_temperature_layer_0": { "value": "material_bed_temperature" },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_max_feedrate_x": { "default_value": 150 },
"machine_max_feedrate_y": { "default_value": 150 },

51
resources/definitions/mp_mini_delta_v2.def.json Normal file
View file

@ -0,0 +1,51 @@
{
"version": 2,
"name": "MP Mini Delta V2",
"inherits": "fdmprinter",
"metadata": {
"author": "mpminidelta subreddit",
"manufacturer": "Monoprice",
"file_formats": "text/x-gcode",
"platform": "mp_mini_delta_platform.3mf",
"supports_usb_connection": true,
"has_machine_quality": false,
"visible": true,
"platform_offset": [0, 0, 0],
"has_materials": true,
"has_variants": false,
"has_machine_materials": false,
"has_variant_materials": false,
"preferred_quality_type": "normal",
"machine_extruder_trains":
{
"0": "mp_mini_delta_v2_extruder_0"
}
},
"overrides": {
"machine_start_gcode":
{
"default_value": ";(**** start.gcode for MP Mini Delta V2****)\nG21\nG90\nM82\nM107\nM104 S170\nG28 X0 Y0\nG28 Z0\nG29 Z0.4\nG1 Z15 F300\nM109 S{material_print_temperature_layer_0}\nG92 E0\nG1 F200 E3\nG92 E0\nG1 F2000\n"
},
"machine_end_gcode": {
"default_value": ";(**** end.gcode for MP Mini Delta V2****)\nG28;(Stick out the part)\nM190 S0;(Turn off heat bed, don't wait.)\nG92 E10;(Set extruder to 10)\nG1 E7 F200;(retract 3mm)\nM104 S0;(Turn off nozzle, don't wait)\nG4 S300;(Delay 5 minutes)\nM107;(Turn off part fan)\nM84;(Turn off stepper motors.)"
},
"material_print_temp_prepend":{"default_value":false},
"material_bed_temperature": { "value": 40 },
"machine_width": { "default_value": 110 },
"machine_depth": { "default_value": 110 },
"machine_height": { "default_value": 120 },
"machine_heated_bed": { "default_value": true },
"machine_shape": { "default_value": "elliptic" },
"machine_center_is_zero": { "default_value": true },
"machine_nozzle_size": {
"default_value": 0.4
},
"line_width": { "value": "round(machine_nozzle_size, 2)" },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"retraction_amount": { "default_value": 5 },
"retraction_speed": { "default_value": 28 },
"retraction_hop_enabled": { "default_value": false },
"retract_at_layer_change": { "default_value": true }
}
}

3
resources/definitions/ultimaker2_plus_connect.def.json
View file

@ -22,7 +22,8 @@
"0": "ultimaker2_plus_connect_extruder_0"
},
"supports_usb_connection": false,
"supports_network_connection": true
"supports_network_connection": true,
"supports_material_export": true
},
"overrides": {

1
resources/definitions/ultimaker_s3.def.json
View file

@ -27,6 +27,7 @@
"first_start_actions": [ "DiscoverUM3Action" ],
"supported_actions": [ "DiscoverUM3Action" ],
"supports_usb_connection": false,
"supports_material_export": true,
"weight": -1,
"firmware_update_info": {
"id": 213482,

1
resources/definitions/ultimaker_s5.def.json
View file

@ -28,6 +28,7 @@
"supported_actions": [ "DiscoverUM3Action" ],
"supports_usb_connection": false,
"supports_network_connection": true,
"supports_material_export": true,
"weight": -2,
"firmware_update_info": {
"id": 9051,

15
resources/extruders/atom2_extruder_0.def.json Normal file
View file

@ -0,0 +1,15 @@
{
"version": 2,
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata": {
"machine": "atom2",
"position": "0"
},
"overrides": {
"extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
}
}

20
resources/extruders/flsun_sr_extruder_0.def.json Normal file
View file

@ -0,0 +1,20 @@
{
"version": 2,
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata": {
"machine": "flsun_sr",
"position": "0"
},
"overrides": {
"extruder_nr": {
"default_value": 0
},
"machine_nozzle_size": {
"default_value": 0.4
},
"material_diameter": {
"default_value": 1.75
}
}
}

15
resources/extruders/mp_mini_delta_v2_extruder_0.def.json Normal file
View file

@ -0,0 +1,15 @@
{
"version": 2,
"name": "Extruder 0",
"inherits": "fdmextruder",
"metadata": {
"machine": "mp_mini_delta_v2",
"position": "0"
},
"overrides": {
"extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
}
}

2
resources/i18n/de_DE/fdmprinter.def.json.po
View file

@ -1177,7 +1177,7 @@ msgstr "Hinten links"
#: fdmprinter.def.json
msgctxt "z_seam_position option back"
msgid "Back"
msgstr "Zurück"
msgstr "Hinten"
#: fdmprinter.def.json
msgctxt "z_seam_position option backright"

BIN
resources/meshes/BIQU_BX_PLATE.stl Normal file
View file

Binary file not shown.

BIN
resources/meshes/flsun_sr.3mf Normal file
View file

Binary file not shown.

1
resources/qml/ActionButton.qml
View file

@ -18,6 +18,7 @@ Button
property alias textFont: buttonText.font
property alias cornerRadius: backgroundRect.radius
property alias tooltip: tooltip.tooltipText
property alias tooltipWidth: tooltip.width
property color color: UM.Theme.getColor("primary")
property color hoverColor: UM.Theme.getColor("primary_hover")

31
resources/qml/Actions.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2018 Ultimaker B.V.
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
pragma Singleton
@ -122,7 +122,15 @@ Item
Action
{
id: quitAction
text: catalog.i18nc("@action:inmenu menubar:file","&Quit")
//On MacOS, don't translate the "Quit" word.
//Qt moves the "quit" entry to a different place, and if it got renamed can't find it again when it attempts to
//delete the item upon closing the application, causing a crash.
//In the new location, these items are translated automatically according to the system's language.
//For more information, see:
//- https://doc.qt.io/qt-5/macos-issues.html#menu-bar
//- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar
text: (Qt.platform.os == "osx") ? "&Quit" : catalog.i18nc("@action:inmenu menubar:file", "&Quit")
iconName: "application-exit"
shortcut: StandardKey.Quit
}
@ -172,7 +180,14 @@ Item
Action
{
id: preferencesAction
text: catalog.i18nc("@action:inmenu", "Configure Cura...")
//On MacOS, don't translate the "Configure" word.
//Qt moves the "configure" entry to a different place, and if it got renamed can't find it again when it
//attempts to delete the item upon closing the application, causing a crash.
//In the new location, these items are translated automatically according to the system's language.
//For more information, see:
//- https://doc.qt.io/qt-5/macos-issues.html#menu-bar
//- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar
text: (Qt.platform.os == "osx") ? "Configure Cura..." : catalog.i18nc("@action:inmenu", "Configure Cura...")
iconName: "configure"
}
@ -263,7 +278,15 @@ Item
Action
{
id: aboutAction;
text: catalog.i18nc("@action:inmenu menubar:help", "About...");
//On MacOS, don't translate the "About" word.
//Qt moves the "about" entry to a different place, and if it got renamed can't find it again when it
//attempts to delete the item upon closing the application, causing a crash.
//In the new location, these items are translated automatically according to the system's language.
//For more information, see:
//- https://doc.qt.io/qt-5/macos-issues.html#menu-bar
//- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar
text: (Qt.platform.os == "osx") ? "About..." : catalog.i18nc("@action:inmenu menubar:help", "About...");
iconName: "help-about";
}

10
resources/qml/Cura.qml
View file

@ -417,6 +417,7 @@ UM.MainWindow
Cura.PrimaryButton
{
text: model.name
iconSource: UM.Theme.getIcon(model.icon)
height: UM.Theme.getSize("message_action_button").height
}
}
@ -426,6 +427,7 @@ UM.MainWindow
Cura.SecondaryButton
{
text: model.name
iconSource: UM.Theme.getIcon(model.icon)
height: UM.Theme.getSize("message_action_button").height
}
}
@ -434,6 +436,14 @@ UM.MainWindow
Cura.TertiaryButton
{
text: model.name
iconSource:
{
if (model.icon == null || model.icon == "")
{
return UM.Theme.getIcon("LinkExternal")
}
return UM.Theme.getIcon(model.icon)
}
height: UM.Theme.getSize("message_action_button").height
}
}

2
resources/qml/ExpandableComponent.qml
View file

@ -167,7 +167,7 @@ Item
verticalCenter: parent.verticalCenter
margins: background.padding
}
source: expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft")
source: UM.Theme.getIcon("ChevronSingleDown")
visible: source != ""
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height

2
resources/qml/ExpandablePopup.qml
View file

@ -180,7 +180,7 @@ Item
verticalCenter: parent.verticalCenter
margins: background.padding
}
source: expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft")
source: UM.Theme.getIcon("ChevronSingleDown")
visible: source != ""
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height

24
resources/qml/MainWindow/ApplicationMenu.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2018 Ultimaker B.V.
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
@ -48,7 +48,17 @@ Item
ViewMenu { title: catalog.i18nc("@title:menu menubar:toplevel", "&View") }
SettingsMenu { title: catalog.i18nc("@title:menu menubar:toplevel", "&Settings") }
SettingsMenu
{
//On MacOS, don't translate the "Settings" word.
//Qt moves the "settings" entry to a different place, and if it got renamed can't find it again when it
//attempts to delete the item upon closing the application, causing a crash.
//In the new location, these items are translated automatically according to the system's language.
//For more information, see:
//- https://doc.qt.io/qt-5/macos-issues.html#menu-bar
//- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar
title: (Qt.platform.os == "osx") ? "&Settings" : catalog.i18nc("@title:menu menubar:toplevel", "&Settings")
}
Menu
{
@ -91,7 +101,15 @@ Item
Menu
{
id: preferencesMenu
title: catalog.i18nc("@title:menu menubar:toplevel", "P&references")
//On MacOS, don't translate the "Preferences" word.
//Qt moves the "preferences" entry to a different place, and if it got renamed can't find it again when it
//attempts to delete the item upon closing the application, causing a crash.
//In the new location, these items are translated automatically according to the system's language.
//For more information, see:
//- https://doc.qt.io/qt-5/macos-issues.html#menu-bar
//- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar
title: (Qt.platform.os == "osx") ? "&Preferences" : catalog.i18nc("@title:menu menubar:toplevel", "P&references")
MenuItem { action: Cura.Actions.preferences }
}

32
resources/qml/Preferences/Materials/MaterialsPage.qml
View file

@ -1,5 +1,5 @@
// Copyright (c) 2018 Ultimaker B.V.
// Uranium is released under the terms of the LGPLv3 or higher.
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 1.4
@ -191,6 +191,21 @@ Item
}
enabled: base.hasCurrentItem
}
//Sync button.
Button
{
id: syncMaterialsButton
text: catalog.i18nc("@action:button Sending materials to printers", "Sync with Printers")
iconName: "sync-synchronizing"
onClicked:
{
forceActiveFocus();
exportAllMaterialsDialog.folder = base.materialManagementModel.getPreferredExportAllPath();
exportAllMaterialsDialog.open();
}
visible: Cura.MachineManager.activeMachine.supportsMaterialExport
}
}
Item {
@ -368,6 +383,19 @@ Item
}
}
FileDialog
{
id: exportAllMaterialsDialog
title: catalog.i18nc("@title:window", "Export All Materials")
selectExisting: false
nameFilters: ["Material archives (*.umm)", "All files (*)"]
onAccepted:
{
base.materialManagementModel.exportAll(fileUrl);
CuraApplication.setDefaultPath("dialog_material_path", folder);
}
}
MessageDialog
{
id: messageDialog

2
resources/qml/Preferences/SettingVisibilityPage.qml
View file

@ -95,7 +95,7 @@ UM.PreferencesPage
placeholderText: catalog.i18nc("@label:textbox", "Filter...")
onTextChanged: definitionsModel.filter = {"i18n_label": "*" + text}
onTextChanged: definitionsModel.filter = {"i18n_label|i18n_description": "*" + text}
}
NewControls.ComboBox

2
resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
View file

@ -54,7 +54,7 @@ Item
{
id: networkPrinterScrollView
maxItemCountAtOnce: 10 // show at max 10 items at once, otherwise you need to scroll.
maxItemCountAtOnce: 9 // show at max 9 items at once, otherwise you need to scroll.
onRefreshButtonClicked:
{

8
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2019 Ultimaker B.V.
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -214,16 +214,16 @@ Item
id: troubleshootingButton
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.rightMargin: UM.Theme.getSize("thin_margin").width
anchors.verticalCenter: parent.verticalCenter
height: troubleshootingLinkIcon.height
width: troubleshootingLinkIcon.width + troubleshootingLabel.width + UM.Theme.getSize("default_margin").width
width: troubleshootingLinkIcon.width + troubleshootingLabel.width + UM.Theme.getSize("thin_margin").width
UM.RecolorImage
{
id: troubleshootingLinkIcon
anchors.right: troubleshootingLabel.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.rightMargin: UM.Theme.getSize("thin_margin").width
anchors.verticalCenter: parent.verticalCenter
height: troubleshootingLabel.height
width: height

24
resources/qml/Widgets/TextField.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2019 Ultimaker B.V.
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -15,6 +15,8 @@ TextField
{
id: textField
property alias leftIcon: iconLeft.source
UM.I18nCatalog { id: catalog; name: "cura" }
hoverEnabled: true
@ -22,6 +24,7 @@ TextField
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
leftPadding: iconLeft.visible ? iconLeft.width + UM.Theme.getSize("default_margin").width * 2 : UM.Theme.getSize("thin_margin").width
states: [
State
@ -52,7 +55,6 @@ TextField
color: UM.Theme.getColor("main_background")
anchors.margins: Math.round(UM.Theme.getSize("default_lining").width)
radius: UM.Theme.getSize("setting_control_radius").width
border.color:
@ -67,5 +69,23 @@ TextField
}
return UM.Theme.getColor("setting_control_border")
}
//Optional icon added on the left hand side.
UM.RecolorImage
{
id: iconLeft
anchors
{
verticalCenter: parent.verticalCenter
left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width
}
visible: source != ""
height: UM.Theme.getSize("small_button_icon").height
width: visible ? height : 0
color: textField.color
}
}
}

2
resources/themes/cura-dark/theme.json
View file

@ -16,7 +16,7 @@
"primary_text": [255, 255, 255, 204],
"secondary": [95, 95, 95, 255],
"secondary_button": [0, 0, 0, 0],
"secondary_button": [39, 44, 48, 255],
"secondary_button_hover": [85, 85, 87, 255],
"secondary_button_text": [255, 255, 255, 255],

4
resources/themes/cura-light/icons/medium/ExtruderColor.svg
View file

@ -6,8 +6,8 @@
.st0{fill:#231F20;}
</style>
<g id="Layer_1_1_">
<path class="st0" d="M15,26C8.9,26,4,21.1,4,15S8.9,4,15,4s11,4.9,11,11S21.1,26,15,26z M15,7c-4.4,0-8,3.6-8,8s3.6,8,8,8
s8-3.6,8-8S19.4,7,15,7z"/>
<path class="st0" d="M15,26C8.9,26,4,21.1,4,15S8.9,4,15,4s11,4.9,11,11S21.1,26,15,26z M15,8c-3.8,0-7,3.2-7,7s3.2,7,7,7
s7-3.1,7-7S18.9,8,15,8z"/>
</g>
<g id="Comments">
</g>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 603 B

After

Width:  |  Height:  |  Size: 603 B

Before After
Before After

2
resources/themes/cura-light/theme.json
View file

@ -193,7 +193,7 @@
"primary_button_hover": [16, 70, 156, 255],
"primary_button_text": [255, 255, 255, 255],
"secondary_button": [255, 255, 255, 0],
"secondary_button": [255, 255, 255, 255],
"secondary_button_shadow": [216, 216, 216, 255],
"secondary_button_hover": [232, 240, 253, 255],
"secondary_button_text": [25, 110, 240, 255],

12
resources/variants/biqu_bx_abl_0.2.inst.cfg Executable file
View file

@ -0,0 +1,12 @@
[general]
name = 0.2mm Nozzle
version = 4
definition = biqu_bx_abl
[metadata]
setting_version = 17
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.2

12
resources/variants/biqu_bx_abl_0.3.inst.cfg Executable file
View file

@ -0,0 +1,12 @@
[general]
name = 0.3mm Nozzle
version = 4
definition = biqu_bx_abl
[metadata]
setting_version = 17
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.3

12
resources/variants/biqu_bx_abl_0.4.inst.cfg Executable file
View file

@ -0,0 +1,12 @@
[general]
name = 0.4mm Nozzle
version = 4
definition = biqu_bx_abl
[metadata]
setting_version = 17
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.4

12
resources/variants/biqu_bx_abl_0.5.inst.cfg Executable file
View file

@ -0,0 +1,12 @@
[general]
name = 0.5mm Nozzle
version = 4
definition = biqu_bx_abl
[metadata]
setting_version = 17
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.5

12
resources/variants/biqu_bx_abl_0.6.inst.cfg Executable file
View file

@ -0,0 +1,12 @@
[general]
name = 0.6mm Nozzle
version = 4
definition = biqu_bx_abl
[metadata]
setting_version = 17
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.6

12
resources/variants/biqu_bx_abl_0.8.inst.cfg Executable file
View file

@ -0,0 +1,12 @@
[general]
name = 0.8mm Nozzle
version = 4
definition = biqu_bx_abl
[metadata]
setting_version = 17
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.8