diff --git a/cura/API/Account.py b/cura/API/Account.py index 4e8c90e052..728d0690a3 100644 --- a/cura/API/Account.py +++ b/cura/API/Account.py @@ -40,7 +40,7 @@ class Account(QObject): """ # The interval in which sync services are automatically triggered - SYNC_INTERVAL = 30.0 # seconds + SYNC_INTERVAL = 60.0 # seconds Q_ENUMS(SyncState) loginStateChanged = pyqtSignal(bool) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index ff9a75c40c..47a60fe51c 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -6,7 +6,7 @@ "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", "visible": false, - "exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone" ] + "exclude_materials": [ "generic_hips", "structur3d_dap100silicone" ] }, "overrides": { "machine_max_feedrate_e": { diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 3980baba31..c028363239 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -18,7 +18,8 @@ { "0": "ultimaker2_extruder_0" }, - "firmware_file": "MarlinUltimaker2.hex" + "firmware_file": "MarlinUltimaker2.hex", + "exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone", "ultimaker_petg_red", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent"] }, "overrides": { "machine_name": { "default_value": "Ultimaker 2" }, diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 7b9c0781f7..8250e70104 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -13,7 +13,7 @@ "has_variants": true, "has_materials": true, "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], + "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_red", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent"], "first_start_actions": [], "supported_actions": [], "machine_extruder_trains": diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index d831221852..9a25167431 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -13,7 +13,7 @@ "has_machine_quality": true, "has_materials": true, "has_variants": true, - "exclude_materials": [ "generic_hips", "generic_petg", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], + "exclude_materials": [ "generic_hips", "generic_petg", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent" ], "preferred_variant_name": "AA 0.4", "preferred_quality_type": "normal", "variants_name": "Print core", diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 34d22934d6..2ade9f1c5c 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -11,7 +11,7 @@ "platform": "ultimaker_platform.3mf", "has_materials": true, "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], + "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent" ], "first_start_actions": ["UMOUpgradeSelection", "BedLevel"], "supported_actions": ["UMOUpgradeSelection", "BedLevel"], "machine_extruder_trains": diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg new file mode 100644 index 0000000000..260f9623f1 --- /dev/null +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Extra Fine +definition = ultimaker2_plus_connect + +[metadata] +setting_version = 16 +type = quality +quality_type = high +weight = 1 +material = generic_petg +variant = 0.25 mm + +[values] +cool_fan_speed_min = =cool_fan_speed * 0.2 +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 25 +cool_min_speed = 15 +infill_sparse_density = 20 +speed_layer_0 = 30 +speed_print = 30 +top_bottom_thickness = 0.72 +wall_thickness = 0.88 +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg new file mode 100644 index 0000000000..b42fc2eca3 --- /dev/null +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = Fast +definition = ultimaker2_plus_connect + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -2 +material = generic_petg +variant = 0.4 mm + +[values] +cool_fan_speed_min = =cool_fan_speed * 0.8 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 10 +infill_sparse_density = 20 +speed_layer_0 = 30 +speed_print = 45 +speed_travel = 150 +speed_wall = =math.ceil(speed_print * 40 / 45) +top_bottom_thickness = 0.75 +wall_thickness = 0.7 +speed_wall_0 = =math.ceil(speed_print * 30 / 45) +speed_topbottom = =math.ceil(speed_print * 30 / 45) +speed_wall_x = =math.ceil(speed_print * 40 / 45) +speed_infill = =math.ceil(speed_print * 45 / 45) +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg new file mode 100644 index 0000000000..e05ee0232e --- /dev/null +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = Normal +definition = ultimaker2_plus_connect + +[metadata] +setting_version = 16 +type = quality +quality_type = fast +weight = -1 +material = generic_petg +variant = 0.4 mm + +[values] +cool_fan_speed_min = =cool_fan_speed * 0.8 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 10 +infill_sparse_density = 20 +speed_layer_0 = 30 +speed_print = 45 +speed_travel = 150 +speed_wall = =math.ceil(speed_print * 40 / 45) +top_bottom_thickness = 0.75 +wall_thickness = 0.7 +speed_wall_0 = =math.ceil(speed_print * 30 / 45) +speed_topbottom = =math.ceil(speed_print * 30 / 45) +speed_wall_x = =math.ceil(speed_print * 40 / 45) +speed_infill = =math.ceil(speed_print * 45 / 45) +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg new file mode 100644 index 0000000000..6f918ac1de --- /dev/null +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Fine +definition = ultimaker2_plus_connect + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = 0.4 mm + +[values] +cool_fan_speed_min = =cool_fan_speed * 0.8 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 10 +infill_sparse_density = 20 +speed_layer_0 = 30 +speed_print = 45 +speed_wall = =math.ceil(speed_print * 30 / 45) +top_bottom_thickness = 0.8 +wall_thickness = 1.05 +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg new file mode 100644 index 0000000000..e0f36471f6 --- /dev/null +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Fine +definition = ultimaker2_plus_connect + +[metadata] +setting_version = 16 +type = quality +quality_type = fast +weight = 0 +material = generic_petg +variant = 0.6 mm + +[values] +cool_fan_speed_min = =cool_fan_speed * 0.8 +cool_min_layer_time = 5 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 8 +infill_sparse_density = 20 +speed_layer_0 = 30 +speed_print = 40 +top_bottom_thickness = 1.2 +wall_thickness = 1.59 +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg new file mode 100644 index 0000000000..2ca91605c2 --- /dev/null +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Normal +definition = ultimaker2_plus_connect + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -1 +material = generic_petg +variant = 0.8 mm + +[values] +cool_fan_speed_min = =cool_fan_speed * 0.8 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 25 +cool_min_speed = 8 +infill_sparse_density = 20 +speed_layer_0 = 30 +speed_print = 40 +top_bottom_thickness = 1.2 +wall_thickness = 2.1 +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg new file mode 100644 index 0000000000..c1bc16cb21 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Fine +definition = ultimaker_s3 + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = AA 0.25 + +[values] +retraction_combing_max_distance = 50 +retraction_extrusion_window = 0.5 +speed_infill = =math.ceil(speed_print * 40 / 55) +speed_topbottom = =math.ceil(speed_print * 30 / 55) +top_bottom_thickness = 0.8 +wall_thickness = 0.92 +initial_layer_line_width_factor = 100 +infill_before_walls = true +material_print_temperature = =default_material_print_temperature - 5 \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg new file mode 100644 index 0000000000..c258df2bea --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s3 + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -2 +material = generic_petg +variant = AA 0.4 + +[values] +material_print_temperature = =default_material_print_temperature + 5 +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature - 5 +retraction_combing_max_distance = 50 +skin_overlap = 20 +speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_topbottom = =math.ceil(speed_print * 35 / 60) +speed_wall = =math.ceil(speed_print * 45 / 60) +speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +wall_thickness = 1 + + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 50 / 60) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg new file mode 100644 index 0000000000..b645e9cccb --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s3 + +[metadata] +setting_version = 16 +type = quality +quality_type = fast +weight = -1 +material = generic_petg +variant = AA 0.4 + +[values] +cool_min_speed = 7 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 +retraction_combing_max_distance = 50 +speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_topbottom = =math.ceil(speed_print * 30 / 60) +speed_wall = =math.ceil(speed_print * 40 / 60) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 50 / 60) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg new file mode 100644 index 0000000000..c090a42562 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg @@ -0,0 +1,29 @@ +[general] +version = 4 +name = Extra Fine +definition = ultimaker_s3 + +[metadata] +setting_version = 16 +type = quality +quality_type = high +weight = 1 +material = generic_petg +variant = AA 0.4 + +[values] +cool_min_speed = 12 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 10 +material_final_print_temperature = =material_print_temperature - 15 +retraction_combing_max_distance = 50 +speed_print = 50 +speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_topbottom = =math.ceil(speed_print * 30 / 50) +speed_wall = =math.ceil(speed_print * 30 / 50) + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 40 / 50) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg new file mode 100644 index 0000000000..27232f3a52 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Fine +definition = ultimaker_s3 + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = AA 0.4 + +[values] +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =material_print_temperature - 10 +material_final_print_temperature = =material_print_temperature - 15 +retraction_combing_max_distance = 50 +speed_print = 55 +speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_topbottom = =math.ceil(speed_print * 30 / 55) +speed_wall = =math.ceil(speed_print * 30 / 55) + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 45 / 55) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg new file mode 100644 index 0000000000..66c24a6d8e --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s3 + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -2 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +retraction_combing_max_distance = 50 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) +jerk_travel = 50 +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 +infill_before_walls = true \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg new file mode 100644 index 0000000000..6dd50e22b5 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Sprint +definition = ultimaker_s3 + +[metadata] +setting_version = 16 +type = quality +quality_type = superdraft +weight = -4 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +retraction_combing_max_distance = 50 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 30 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +jerk_travel = 50 +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 +infill_before_walls = true \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg new file mode 100644 index 0000000000..04e1baf3a7 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Extra Fast +definition = ultimaker_s3 + +[metadata] +setting_version = 16 +type = quality +quality_type = verydraft +weight = -3 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +retraction_combing_max_distance = 50 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) +jerk_travel = 50 +cool_fan_speed = 20 +layer_height_0 = 0.27 +initial_layer_line_width_factor = 100 +infill_before_walls = true diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg new file mode 100644 index 0000000000..97c27ff13d --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Fine +definition = ultimaker_s5 + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = AA 0.25 + +[values] +retraction_combing_max_distance = 50 +retraction_extrusion_window = 0.5 +speed_infill = =math.ceil(speed_print * 40 / 55) +speed_topbottom = =math.ceil(speed_print * 30 / 55) +top_bottom_thickness = 0.8 +wall_thickness = 0.92 +initial_layer_line_width_factor = 100 +infill_before_walls = true +material_print_temperature = =default_material_print_temperature - 5 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg new file mode 100644 index 0000000000..e8065268dd --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -2 +material = generic_petg +variant = AA 0.4 + +[values] +material_print_temperature = =default_material_print_temperature + 5 +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature - 5 +retraction_combing_max_distance = 50 +skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0 +skin_overlap = 20 +speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_topbottom = =math.ceil(speed_print * 35 / 60) +speed_wall = =math.ceil(speed_print * 45 / 60) +speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +top_thickness = =0.8 if infill_sparse_density < 30 and skin_edge_support_thickness == 0.8 else top_bottom_thickness +wall_thickness = 1 + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 50 / 60) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg new file mode 100644 index 0000000000..509e6d0dba --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s5 + +[metadata] +setting_version = 16 +type = quality +quality_type = fast +weight = -1 +material = generic_petg +variant = AA 0.4 + +[values] +cool_min_speed = 7 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 +retraction_combing_max_distance = 50 +speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_topbottom = =math.ceil(speed_print * 30 / 60) +speed_wall = =math.ceil(speed_print * 40 / 60) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 50 / 60) +initial_layer_line_width_factor = 100 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg new file mode 100644 index 0000000000..f5de46b389 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg @@ -0,0 +1,29 @@ +[general] +version = 4 +name = Extra Fine +definition = ultimaker_s5 + +[metadata] +setting_version = 16 +type = quality +quality_type = high +weight = 1 +material = generic_petg +variant = AA 0.4 + +[values] +cool_min_speed = 12 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 10 +material_final_print_temperature = =material_print_temperature - 15 +retraction_combing_max_distance = 50 +speed_print = 50 +speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_topbottom = =math.ceil(speed_print * 30 / 50) +speed_wall = =math.ceil(speed_print * 30 / 50) + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 40 / 50) +initial_layer_line_width_factor = 100 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg new file mode 100644 index 0000000000..3182d37e83 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Fine +definition = ultimaker_s5 + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = AA 0.4 + +[values] +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =material_print_temperature - 10 +material_final_print_temperature = =material_print_temperature - 15 +retraction_combing_max_distance = 50 +speed_print = 55 +speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_topbottom = =math.ceil(speed_print * 30 / 55) +speed_wall = =math.ceil(speed_print * 30 / 55) +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 45 / 55) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg new file mode 100644 index 0000000000..28a8999bdd --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -2 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +retraction_combing_max_distance = 50 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) +jerk_travel = 50 +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 +infill_before_walls = true \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg new file mode 100644 index 0000000000..342ac6713d --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Sprint +definition = ultimaker_s5 + +[metadata] +setting_version = 16 +type = quality +quality_type = superdraft +weight = -4 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +retraction_combing_max_distance = 50 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 30 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +jerk_travel = 50 +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 +infill_before_walls = true diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg new file mode 100644 index 0000000000..1d102b7c89 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Extra Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 16 +type = quality +quality_type = verydraft +weight = -3 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +retraction_combing_max_distance = 50 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) +jerk_travel = 50 +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 +infill_before_walls = true diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml index b56080a6c6..5f15491742 100755 --- a/resources/themes/cura-light/styles.qml +++ b/resources/themes/cura-light/styles.qml @@ -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.10 @@ -21,49 +21,49 @@ QtObject { if(control.valueError) { - return Theme.getColor("setting_validation_error_background"); + return UM.Theme.getColor("setting_validation_error_background"); } else if(control.valueWarning) { - return Theme.getColor("setting_validation_warning_background"); + return UM.Theme.getColor("setting_validation_warning_background"); } else { - return Theme.getColor("setting_control"); + return UM.Theme.getColor("setting_control"); } } else { - return Theme.getColor("setting_control_disabled"); + return UM.Theme.getColor("setting_control_disabled"); } } radius: UM.Theme.getSize("setting_control_radius").width - border.width: Theme.getSize("default_lining").width + border.width: UM.Theme.getSize("default_lining").width border.color: { if (control.enabled) { if (control.valueError) { - return Theme.getColor("setting_validation_error"); + return UM.Theme.getColor("setting_validation_error"); } else if (control.valueWarning) { - return Theme.getColor("setting_validation_warning"); + return UM.Theme.getColor("setting_validation_warning"); } else if (control.hovered) { - return Theme.getColor("setting_control_border_highlight"); + return UM.Theme.getColor("setting_control_border_highlight"); } else { - return Theme.getColor("setting_control_border"); + return UM.Theme.getColor("setting_control_border"); } } else { - return Theme.getColor("setting_control_disabled_border"); + return UM.Theme.getColor("setting_control_disabled_border"); } } UM.RecolorImage @@ -71,25 +71,30 @@ QtObject id: downArrow anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: Theme.getSize("default_margin").width - width: Theme.getSize("standard_arrow").width - height: Theme.getSize("standard_arrow").height + anchors.rightMargin: UM.Theme.getSize("default_margin").width + width: UM.Theme.getSize("standard_arrow").width + height: UM.Theme.getSize("standard_arrow").height sourceSize.height: width +<<<<<<< HEAD color: control.enabled ? Theme.getColor("setting_control_button") : Theme.getColor("setting_category_disabled_text") source: Theme.getIcon("ChevronSingleDown") +======= + color: control.enabled ? UM.Theme.getColor("setting_control_button") : UM.Theme.getColor("setting_category_disabled_text") + source: UM.Theme.getIcon("arrow_bottom") +>>>>>>> 4.9 } Label { id: printSetupComboBoxLabel - color: control.enabled ? Theme.getColor("setting_control_text") : Theme.getColor("setting_control_disabled_text") + color: control.enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") text: control.text; elide: Text.ElideRight; anchors.left: parent.left; - anchors.leftMargin: Theme.getSize("setting_unit_margin").width + anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width anchors.right: downArrow.left; anchors.rightMargin: control.rightMargin; anchors.verticalCenter: parent.verticalCenter; - font: Theme.getFont("default") + font: UM.Theme.getFont("default") } } label: Label{} @@ -175,25 +180,25 @@ QtObject { background: Item { - implicitWidth: Theme.getSize("button").width - implicitHeight: Theme.getSize("button").height + implicitWidth: UM.Theme.getSize("button").width + implicitHeight: UM.Theme.getSize("button").height UM.PointingRectangle { id: button_tooltip anchors.left: parent.right - anchors.leftMargin: Theme.getSize("button_tooltip_arrow").width * 2 + anchors.leftMargin: UM.Theme.getSize("button_tooltip_arrow").width * 2 anchors.verticalCenter: parent.verticalCenter target: Qt.point(parent.x, y + Math.round(height/2)) - arrowSize: Theme.getSize("button_tooltip_arrow").width - color: Theme.getColor("button_tooltip") + arrowSize: UM.Theme.getSize("button_tooltip_arrow").width + color: UM.Theme.getColor("button_tooltip") opacity: control.hovered ? 1.0 : 0.0; visible: control.text != "" - width: control.hovered ? button_tip.width + Theme.getSize("button_tooltip").width : 0 - height: Theme.getSize("button_tooltip").height + width: control.hovered ? button_tip.width + UM.Theme.getSize("button_tooltip").width : 0 + height: UM.Theme.getSize("button_tooltip").height Behavior on width { NumberAnimation { duration: 100; } } Behavior on opacity { NumberAnimation { duration: 100; } } @@ -206,8 +211,8 @@ QtObject anchors.verticalCenter: parent.verticalCenter text: control.text - font: Theme.getFont("default") - color: Theme.getColor("tooltip_text") + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("tooltip_text") } } @@ -226,22 +231,22 @@ QtObject } else if(control.checkable && control.checked && control.hovered) { - return Theme.getColor("toolbar_button_active_hover") + return UM.Theme.getColor("toolbar_button_active_hover") } else if(control.pressed || (control.checkable && control.checked)) { - return Theme.getColor("toolbar_button_active") + return UM.Theme.getColor("toolbar_button_active") } else if(control.hovered) { - return Theme.getColor("toolbar_button_hover") + return UM.Theme.getColor("toolbar_button_hover") } - return Theme.getColor("toolbar_background") + return UM.Theme.getColor("toolbar_background") } Behavior on color { ColorAnimation { duration: 50; } } - border.width: (control.hasOwnProperty("needBorder") && control.needBorder) ? Theme.getSize("default_lining").width : 0 - border.color: control.checked ? Theme.getColor("icon") : Theme.getColor("lining") + border.width: (control.hasOwnProperty("needBorder") && control.needBorder) ? UM.Theme.getSize("default_lining").width : 0 + border.color: control.checked ? UM.Theme.getColor("icon") : UM.Theme.getColor("lining") } } @@ -252,11 +257,11 @@ QtObject anchors.centerIn: parent opacity: control.enabled ? 1.0 : 0.2 source: control.iconSource - width: Theme.getSize("button_icon").width - height: Theme.getSize("button_icon").height - color: Theme.getColor("icon") + width: UM.Theme.getSize("button_icon").width + height: UM.Theme.getSize("button_icon").height + color: UM.Theme.getColor("icon") - sourceSize: Theme.getSize("button_icon") + sourceSize: UM.Theme.getSize("button_icon") } } } @@ -268,10 +273,10 @@ QtObject { background: Rectangle { - implicitWidth: Theme.getSize("message").width - (Theme.getSize("default_margin").width * 2) - implicitHeight: Theme.getSize("progressbar").height - color: control.hasOwnProperty("backgroundColor") ? control.backgroundColor : Theme.getColor("progressbar_background") - radius: Theme.getSize("progressbar_radius").width + implicitWidth: UM.Theme.getSize("message").width - (UM.Theme.getSize("default_margin").width * 2) + implicitHeight: UM.Theme.getSize("progressbar").height + color: control.hasOwnProperty("backgroundColor") ? control.backgroundColor : UM.Theme.getColor("progressbar_background") + radius: UM.Theme.getSize("progressbar_radius").width } progress: Rectangle { @@ -287,22 +292,22 @@ QtObject } else { - return Theme.getColor("progressbar_control"); + return UM.Theme.getColor("progressbar_control"); } } - radius: Theme.getSize("progressbar_radius").width + radius: UM.Theme.getSize("progressbar_radius").width Rectangle { - radius: Theme.getSize("progressbar_radius").width - color: control.hasOwnProperty("controlColor") ? control.controlColor : Theme.getColor("progressbar_control") - width: Theme.getSize("progressbar_control").width - height: Theme.getSize("progressbar_control").height + radius: UM.Theme.getSize("progressbar_radius").width + color: control.hasOwnProperty("controlColor") ? control.controlColor : UM.Theme.getColor("progressbar_control") + width: UM.Theme.getSize("progressbar_control").width + height: UM.Theme.getSize("progressbar_control").height visible: control.indeterminate SequentialAnimation on x { id: xAnim - property int animEndPoint: Theme.getSize("message").width - Math.round((Theme.getSize("default_margin").width * 2.5)) - Theme.getSize("progressbar_control").width + property int animEndPoint: UM.Theme.getSize("message").width - Math.round((UM.Theme.getSize("default_margin").width * 2.5)) - UM.Theme.getSize("progressbar_control").width running: control.indeterminate && control.visible loops: Animation.Infinite NumberAnimation { from: 0; to: xAnim.animEndPoint; duration: 2000;} @@ -324,18 +329,18 @@ QtObject scrollBarBackground: Rectangle { - implicitWidth: Theme.getSize("scrollbar").width + implicitWidth: UM.Theme.getSize("scrollbar").width radius: Math.round(implicitWidth / 2) - color: Theme.getColor("scrollbar_background") + color: UM.Theme.getColor("scrollbar_background") } handle: Rectangle { id: scrollViewHandle - implicitWidth: Theme.getSize("scrollbar").width + implicitWidth: UM.Theme.getSize("scrollbar").width radius: Math.round(implicitWidth / 2) - color: styleData.pressed ? Theme.getColor("scrollbar_handle_down") : styleData.hovered ? Theme.getColor("scrollbar_handle_hover") : Theme.getColor("scrollbar_handle") + color: styleData.pressed ? UM.Theme.getColor("scrollbar_handle_down") : styleData.hovered ? UM.Theme.getColor("scrollbar_handle_hover") : UM.Theme.getColor("scrollbar_handle") Behavior on color { ColorAnimation { duration: 50; } } } } @@ -348,14 +353,14 @@ QtObject background: Rectangle { - implicitHeight: Theme.getSize("setting_control").height; - implicitWidth: Theme.getSize("setting_control").width; + implicitHeight: UM.Theme.getSize("setting_control").height; + implicitWidth: UM.Theme.getSize("setting_control").width; color: control.hovered ? UM.Theme.getColor("setting_control_highlight") : UM.Theme.getColor("setting_control") Behavior on color { ColorAnimation { duration: 50; } } - border.width: Theme.getSize("default_lining").width; - border.color: control.hovered ? Theme.getColor("setting_control_border_highlight") : Theme.getColor("setting_control_border"); + border.width: UM.Theme.getSize("default_lining").width; + border.color: control.hovered ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border"); radius: UM.Theme.getSize("setting_control_radius").width } @@ -364,14 +369,14 @@ QtObject Label { anchors.left: parent.left - anchors.leftMargin: Theme.getSize("default_lining").width + anchors.leftMargin: UM.Theme.getSize("default_lining").width anchors.right: downArrow.left - anchors.rightMargin: Theme.getSize("default_lining").width + anchors.rightMargin: UM.Theme.getSize("default_lining").width anchors.verticalCenter: parent.verticalCenter text: control.currentText - font: Theme.getFont("default"); - color: !enabled ? Theme.getColor("setting_control_disabled_text") : Theme.getColor("setting_control_text") + font: UM.Theme.getFont("default"); + color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text") elide: Text.ElideRight verticalAlignment: Text.AlignVCenter @@ -381,16 +386,16 @@ QtObject { id: downArrow anchors.right: parent.right - anchors.rightMargin: Theme.getSize("default_lining").width * 2 + anchors.rightMargin: UM.Theme.getSize("default_lining").width * 2 anchors.verticalCenter: parent.verticalCenter - source: Theme.getIcon("ChevronSingleDown") - width: Theme.getSize("standard_arrow").width - height: Theme.getSize("standard_arrow").height + source: UM.Theme.getIcon("ChevronSingleDown") + width: UM.Theme.getSize("standard_arrow").width + height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor sourceSize.height: width + 5 * screenScaleFactor - color: Theme.getColor("setting_control_button"); + color: UM.Theme.getColor("setting_control_button"); } } } @@ -403,16 +408,16 @@ QtObject background: Item { } indicator: Rectangle { - implicitWidth: Theme.getSize("checkbox").width - implicitHeight: Theme.getSize("checkbox").height + implicitWidth: UM.Theme.getSize("checkbox").width + implicitHeight: UM.Theme.getSize("checkbox").height - color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_hover") : (control.enabled ? Theme.getColor("checkbox") : Theme.getColor("checkbox_disabled")) + color: (control.hovered || control._hovered) ? UM.Theme.getColor("checkbox_hover") : (control.enabled ? UM.Theme.getColor("checkbox") : UM.Theme.getColor("checkbox_disabled")) Behavior on color { ColorAnimation { duration: 50; } } - radius: control.exclusiveGroup ? Math.round(Theme.getSize("checkbox").width / 2) : Theme.getSize("checkbox_radius").width + radius: control.exclusiveGroup ? Math.round(UM.Theme.getSize("checkbox").width / 2) : UM.Theme.getSize("checkbox_radius").width - border.width: Theme.getSize("default_lining").width - border.color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_border_hover") : Theme.getColor("checkbox_border") + border.width: UM.Theme.getSize("default_lining").width + border.color: (control.hovered || control._hovered) ? UM.Theme.getColor("checkbox_border_hover") : UM.Theme.getColor("checkbox_border") UM.RecolorImage { @@ -421,8 +426,8 @@ QtObject width: Math.round(parent.width / 2.5) height: Math.round(parent.height / 2.5) sourceSize.height: width - color: Theme.getColor("checkbox_mark") - source: control.exclusiveGroup ? Theme.getIcon("Dot", "low") : Theme.getIcon("Check") + color: UM.Theme.getColor("checkbox_mark") + source: control.exclusiveGroup ? UM.Theme.getIcon("Dot") : UM.Theme.getIcon("Check") opacity: control.checked Behavior on opacity { NumberAnimation { duration: 100; } } } @@ -430,8 +435,8 @@ QtObject label: Label { text: control.text - color: Theme.getColor("checkbox_text") - font: Theme.getFont("default") + color: UM.Theme.getColor("checkbox_text") + font: UM.Theme.getFont("default") elide: Text.ElideRight renderType: Text.NativeRendering } @@ -445,16 +450,16 @@ QtObject background: Item { } indicator: Rectangle { - implicitWidth: Theme.getSize("checkbox").width - implicitHeight: Theme.getSize("checkbox").height + implicitWidth: UM.Theme.getSize("checkbox").width + implicitHeight: UM.Theme.getSize("checkbox").height - color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_hover") : Theme.getColor("checkbox"); + color: (control.hovered || control._hovered) ? UM.Theme.getColor("checkbox_hover") : UM.Theme.getColor("checkbox"); Behavior on color { ColorAnimation { duration: 50; } } - radius: control.exclusiveGroup ? Math.round(Theme.getSize("checkbox").width / 2) : UM.Theme.getSize("checkbox_radius").width + radius: control.exclusiveGroup ? Math.round(UM.Theme.getSize("checkbox").width / 2) : UM.Theme.getSize("checkbox_radius").width - border.width: Theme.getSize("default_lining").width; - border.color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_border_hover") : Theme.getColor("checkbox_border"); + border.width: UM.Theme.getSize("default_lining").width; + border.color: (control.hovered || control._hovered) ? UM.Theme.getColor("checkbox_border_hover") : UM.Theme.getColor("checkbox_border"); UM.RecolorImage { @@ -463,16 +468,16 @@ QtObject width: Math.round(parent.width / 2.5) height: Math.round(parent.height / 2.5) sourceSize.height: width - color: Theme.getColor("checkbox_mark") + color: UM.Theme.getColor("checkbox_mark") source: { if (control.checkbox_state == 2) { - return Theme.getIcon("Solid"); + return UM.Theme.getIcon("Solid"); } else { - return control.exclusiveGroup ? Theme.getIcon("Dot", "low") : Theme.getIcon("Check"); + return control.exclusiveGroup ? UM.Theme.getIcon("Dot", "low") : UM.Theme.getIcon("Check"); } } opacity: control.checked @@ -482,8 +487,8 @@ QtObject label: Label { text: control.text - color: Theme.getColor("checkbox_text") - font: Theme.getFont("default") + color: UM.Theme.getColor("checkbox_text") + font: UM.Theme.getFont("default") } } } @@ -492,30 +497,30 @@ QtObject { TextFieldStyle { - textColor: Theme.getColor("setting_control_text") - placeholderTextColor: Theme.getColor("setting_control_text") - font: Theme.getFont("default") + textColor: UM.Theme.getColor("setting_control_text") + placeholderTextColor: UM.Theme.getColor("setting_control_text") + font: UM.Theme.getFont("default") background: Rectangle { implicitHeight: control.height; implicitWidth: control.width; - border.width: Theme.getSize("default_lining").width; - border.color: control.hovered ? Theme.getColor("setting_control_border_highlight") : Theme.getColor("setting_control_border"); + border.width: UM.Theme.getSize("default_lining").width; + border.color: control.hovered ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border"); radius: UM.Theme.getSize("setting_control_radius").width - color: Theme.getColor("setting_validation_ok"); + color: UM.Theme.getColor("setting_validation_ok"); Label { anchors.right: parent.right; - anchors.rightMargin: Theme.getSize("setting_unit_margin").width; + anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width; anchors.verticalCenter: parent.verticalCenter; text: control.unit ? control.unit : "" - color: Theme.getColor("setting_unit"); - font: Theme.getFont("default"); + color: UM.Theme.getColor("setting_unit"); + font: UM.Theme.getFont("default"); renderType: Text.NativeRendering } }