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

Merge remote-tracking branch 'origin/main' into optimized-prime-tower

Browse source
This commit is contained in:
Erwan MATHIEU 2024-01-17 13:01:41 +01:00
commit 8d0329f284
87 changed files with 375 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,7 +112,6 @@
"support_interface_density": { "value": 33.333 },
"support_interface_enable": { "value": true },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_roof_enable": { "value": true },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },
"support_xy_distance_overhang": { "value": "wall_line_width_0" },

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

@ -114,7 +114,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },
"support_xy_distance_overhang": { "value": "wall_line_width_0" },
"support_xy_overrides_z": { "value": "'xy_overrides_z'" },

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

@ -154,7 +154,6 @@
"support_infill_rate": { "value": "20" },
"support_interface_enable": { "value": "True" },
"support_interface_height": { "value": "1" },
"support_interface_skip_height": { "value": "layer_height" },
"support_join_distance": { "value": "1" },
"support_offset": { "value": "1.5" },
"support_pattern": { "default_value": "zigzag" },

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

@ -108,7 +108,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

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

@ -97,7 +97,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },
"support_xy_distance_overhang": { "value": "wall_line_width_0" },

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

@ -5423,20 +5423,6 @@
}
}
},
"support_interface_skip_height":
{
"label": "Support Interface Resolution",
"description": "When checking where there's model above and below the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface.",
"unit": "mm",
"type": "float",
"default_value": 0.2,
"value": "layer_height",
"minimum_value": "0",
"maximum_value_warning": "support_interface_height",
"limit_to_extruder": "support_interface_extruder_nr",
"enabled": "support_interface_enable and (support_enable or support_meshes_present)",
"settable_per_mesh": true
},
"support_interface_density":
{
"label": "Support Interface Density",

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

@ -92,7 +92,6 @@
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_line_width": { "value": "line_width - 0.1" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

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

@ -112,7 +112,6 @@
"support_interface_density": { "value": 33.333 },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 0 },
"support_xy_distance": { "value": "wall_line_width_0 * 3" },

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

@ -133,7 +133,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

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

@ -70,7 +70,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

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

@ -88,7 +88,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

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

@ -88,7 +88,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

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

@ -109,7 +109,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

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

@ -119,7 +119,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

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

@ -70,7 +70,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

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

@ -111,7 +111,6 @@
"support_interface_density": { "value": 33.333 },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": "1 if (support_structure == 'tree') else 0" },
"support_xy_distance": { "value": "wall_line_width_0 * 3" },

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

@ -68,7 +68,6 @@
"support_interface_density": { "value": 33.333 },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": "1 if (support_structure == 'tree') else 0" },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

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

@ -99,7 +99,7 @@
"acceleration_print":
{
"enabled": false,
"value": 300
"value": 800
},
"acceleration_print_layer_0":
{
@ -234,7 +234,7 @@
"jerk_print":
{
"enabled": false,
"value": 12.5
"value": 6.25
},
"jerk_print_layer_0":
{
@ -279,7 +279,7 @@
"jerk_travel":
{
"enabled": false,
"value": 12.5
"value": "jerk_print"
},
"jerk_travel_enabled":
{

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

@ -99,7 +99,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

5
resources/extruders/ultimaker_methodx_extruder_left.def.json
View file

@ -14,8 +14,9 @@
"default_value": 0,
"maximum_value": "1"
},
"machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
"machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" },
"machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
"machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" },
"machine_extruder_start_code_duration": { "default_value": 8 },
"machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },

5
resources/extruders/ultimaker_methodx_extruder_right.def.json
View file

@ -14,8 +14,9 @@
"default_value": 1,
"maximum_value": "1"
},
"machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
"machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" },
"machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
"machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" },
"machine_extruder_start_code_duration": { "default_value": 8 },
"machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },

5
resources/extruders/ultimaker_methodxl_extruder_left.def.json
View file

@ -14,8 +14,9 @@
"default_value": 0,
"maximum_value": "1"
},
"machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
"machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" },
"machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
"machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" },
"machine_extruder_start_code_duration": { "default_value": 10 },
"machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },

5
resources/extruders/ultimaker_methodxl_extruder_right.def.json
View file

@ -14,8 +14,9 @@
"default_value": 1,
"maximum_value": "1"
},
"machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
"machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" },
"machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
"machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" },
"machine_extruder_start_code_duration": { "default_value": 10 },
"machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },

8
resources/i18n/fdmprinter.def.json.pot
View file

@ -3548,14 +3548,6 @@ msgctxt "support_bottom_height description"
msgid "The thickness of the support floors. This controls the number of dense layers that are printed on top of places of a model on which support rests."
msgstr ""
msgctxt "support_interface_skip_height label"
msgid "Support Interface Resolution"
msgstr ""
msgctxt "support_interface_skip_height description"
msgid "When checking where there's model above and below the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface."
msgstr ""
msgctxt "support_interface_density label"
msgid "Support Interface Density"
msgstr ""

8
resources/qml/Actions.qml
View file

@ -120,8 +120,8 @@ Item
text: catalog.i18nc("@action:inmenu menubar:edit", "&Undo")
icon.name: "edit-undo"
shortcut: StandardKey.Undo
onTriggered: UM.OperationStack.undo()
enabled: UM.OperationStack.canUndo
onTriggered: CuraActions.undo()
enabled: CuraActions.canUndo
}
Action
@ -130,8 +130,8 @@ Item
text: catalog.i18nc("@action:inmenu menubar:edit", "&Redo")
icon.name: "edit-redo"
shortcut: StandardKey.Redo
onTriggered: UM.OperationStack.redo()
enabled: UM.OperationStack.canRedo
onTriggered: CuraActions.redo()
enabled: CuraActions.canRedo
}
Action

2
resources/qml/Dialogs/AboutDialog.qml
View file

@ -58,7 +58,7 @@ UM.Dialog
UM.Label
{
id: version
text: catalog.i18nc("@label","version: %1").arg(UM.Application.version)
text: catalog.i18nc("@label","version: %1").arg(CuraApplication.version())
font: UM.Theme.getFont("large_bold")
color: UM.Theme.getColor("button_text")
anchors.right : logo.right

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

@ -124,6 +124,9 @@ UM.PreferencesPage
UM.Preferences.resetPreference("info/send_engine_crash")
sendEngineCrashCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_engine_crash"))
UM.Preferences.resetPreference("info/anonymous_engine_crash_report")
sendEngineCrashCheckboxAnonymous.checked = boolCheck(UM.Preferences.getValue("info/anonymous_engine_crash_report"))
UM.Preferences.resetPreference("info/automatic_update_check")
checkUpdatesCheckbox.checked = boolCheck(UM.Preferences.getValue("info/automatic_update_check"))
@ -859,21 +862,63 @@ UM.PreferencesPage
font: UM.Theme.getFont("medium_bold")
text: catalog.i18nc("@label", "Privacy")
}
UM.TooltipArea
{
width: childrenRect.width
height: visible ? childrenRect.height : 0
text: catalog.i18nc("@info:tooltip", "Should slicing crashes be automatically reported to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.")
text: catalog.i18nc("@info:tooltip", "Should slicing crashes be automatically reported to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored, unless you give explicit permission.")
UM.CheckBox
{
id: sendEngineCrashCheckbox
text: catalog.i18nc("@option:check","Send (anonymous) engine crash reports")
text: catalog.i18nc("@option:check","Send engine crash reports")
checked: boolCheck(UM.Preferences.getValue("info/send_engine_crash"))
onCheckedChanged: UM.Preferences.setValue("info/send_engine_crash", checked)
}
}
ButtonGroup
{
id: curaCrashGroup
buttons: [sendEngineCrashCheckboxAnonymous, sendEngineCrashCheckboxUser]
}
UM.TooltipArea
{
width: childrenRect.width
height: visible ? childrenRect.height : 0
text: catalog.i18nc("@info:tooltip", "Send crash reports without any personally identifiable information or models data to UltiMaker.")
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
Cura.RadioButton
{
id: sendEngineCrashCheckboxAnonymous
text: catalog.i18nc("@option:radio", "Anonymous crash reports")
enabled: sendEngineCrashCheckbox.checked && Cura.API.account.isLoggedIn
checked: boolCheck(UM.Preferences.getValue("info/anonymous_engine_crash_report"))
onClicked: UM.Preferences.setValue("info/anonymous_engine_crash_report", true)
}
}
UM.TooltipArea
{
width: childrenRect.width
height: visible ? childrenRect.height : 0
text: Cura.API.account.isLoggedIn ?
catalog.i18nc("@info:tooltip", "Send crash reports with your registered UltiMaker account name and the project name to UltiMaker Sentry. No actual model data is being send.") :
catalog.i18nc("@info:tooltip", "Please sign in to your UltiMaker account to allow sending non-anonymous data.")
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
Cura.RadioButton
{
id: sendEngineCrashCheckboxUser
text: catalog.i18nc("@option:radio", "Include UltiMaker account name")
enabled: sendEngineCrashCheckbox.checked && Cura.API.account.isLoggedIn
checked: !boolCheck(UM.Preferences.getValue("info/anonymous_engine_crash_report")) && Cura.API.account.isLoggedIn
onClicked: UM.Preferences.setValue("info/anonymous_engine_crash_report", false)
}
}
UM.TooltipArea
{
width: childrenRect.width

4
resources/qml/Preferences/MachinesPage.qml
View file

@ -12,6 +12,7 @@ import Cura 1.0 as Cura
UM.ManagementPage
{
id: base
property var machineActionManager: CuraApplication.getMachineActionManagerQml()
Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} }
title: catalog.i18nc("@title:tab", "Printers")
@ -58,10 +59,11 @@ UM.ManagementPage
anchors.fill: parent
spacing: UM.Theme.getSize("default_margin").height
Repeater
{
id: machineActionRepeater
model: base.currentItem ? Cura.MachineActionManager.getSupportedActions(Cura.MachineManager.getDefinitionByMachineId(base.currentItem.id)) : null
model: base.currentItem ? machineActionManager.getSupportedActions(Cura.MachineManager.getDefinitionByMachineId(base.currentItem.id)) : null
Item
{

2
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View file

@ -160,7 +160,7 @@ Item
ProfileWarningReset
{
id: profileWarningReset
width: childrenRect.width
width: parent.width
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
fullWarning: false

2
resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml
View file

@ -187,7 +187,7 @@ Popup
//Add all the custom profiles.
Repeater
{
model: Cura.CustomQualityProfilesDropDownMenuModel
model: CuraApplication.getCustomQualityProfilesDropDownMenuModel()
MenuButton
{
onClicked: Cura.MachineManager.setQualityChangesGroup(model.quality_changes_group)

4
resources/qml/PrintSetupSelector/ProfileWarningReset.qml
View file

@ -11,7 +11,7 @@ import "../Dialogs"
Item
{
property bool fullWarning: true // <- Can you see the warning icon and the text, or is it just the buttons?
property var simpleModeSettingsManager :CuraApplication.getSimpleModeSettingsManager()
height: visible ? UM.Theme.getSize("action_button_icon").height : 0
width: visible ? childrenRect.width: 0
visible: Cura.MachineManager.hasUserSettings || (fullWarning && Cura.MachineManager.hasCustomQuality)
@ -96,7 +96,7 @@ Item
State
{
name: "custom settings changed"
when: Cura.SimpleModeSettingsManager.isProfileCustomized
when: simpleModeSettingsManager.isProfileCustomized
PropertyChanges
{
target: warning

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

@ -223,7 +223,7 @@ SettingItem
cursorShape: Qt.IBeamCursor
onPressed: {
onPressed:(mouse)=> {
if (!input.activeFocus)
{
base.focusGainedByClick = true

4
resources/qml/Toolbar.qml
View file

@ -203,7 +203,7 @@ Item
x: UM.Theme.getSize("default_margin").width
y: UM.Theme.getSize("default_margin").height
source: UM.ActiveTool.valid ? UM.ActiveTool.activeToolPanel : ""
source: UM.Controller.valid ? UM.Controller.activeToolPanel : ""
enabled: UM.Controller.toolsEnabled
}
}
@ -222,7 +222,7 @@ Item
UM.Label
{
id: toolHint
text: UM.ActiveTool.properties.getValue("ToolHint") != undefined ? UM.ActiveTool.properties.getValue("ToolHint") : ""
text: UM.Controller.properties.getValue("ToolHint") != undefined ? UM.ActiveTool.properties.getValue("ToolHint") : ""
color: UM.Theme.getColor("tooltip_text")
anchors.horizontalCenter: parent.horizontalCenter
}

1
resources/quality/beamup_l/beamup_l_coarse.inst.cfg
View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.60
support_interface_pattern = zigzag
support_interface_skip_height = 0.30
support_offset = 0.8
support_z_distance = 0.4
wall_thickness = 1.6

1
resources/quality/beamup_l/beamup_l_draft.inst.cfg
View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.60
support_interface_pattern = zigzag
support_interface_skip_height = 0.20
support_offset = 0.8
support_z_distance = 0.3
wall_thickness = 1.6

1
resources/quality/beamup_l/beamup_l_extra_fine.inst.cfg
View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.30
support_interface_pattern = zigzag
support_interface_skip_height = 0.06
support_offset = 0.8
support_z_distance = 0.12
wall_thickness = 1.6

1
resources/quality/beamup_l/beamup_l_fine.inst.cfg
View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.30
support_interface_pattern = zigzag
support_interface_skip_height = 0.10
support_offset = 0.8
support_z_distance = 0.2
wall_thickness = 1.6

1
resources/quality/beamup_l/beamup_l_normal.inst.cfg
View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.45
support_interface_pattern = zigzag
support_interface_skip_height = 0.15
support_offset = 0.8
support_z_distance = 0.25
wall_thickness = 1.6

1
resources/quality/beamup_s/beamup_s_coarse.inst.cfg
View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.60
support_interface_pattern = zigzag
support_interface_skip_height = 0.30
support_offset = 0.8
support_z_distance = 0.2
wall_thickness = 0.8

1
resources/quality/beamup_s/beamup_s_draft.inst.cfg
View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.40
support_interface_pattern = zigzag
support_interface_skip_height = 0.20
support_offset = 0.8
support_z_distance = 0.2
wall_thickness = 0.8

1
resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg
View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.30
support_interface_pattern = zigzag
support_interface_skip_height = 0.06
support_offset = 0.8
support_z_distance = 0.2
wall_thickness = 0.8

1
resources/quality/beamup_s/beamup_s_fine.inst.cfg
View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.30
support_interface_pattern = zigzag
support_interface_skip_height = 0.10
support_offset = 0.8
support_z_distance = 0.2
wall_thickness = 0.8

1
resources/quality/beamup_s/beamup_s_normal.inst.cfg
View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.45
support_interface_pattern = zigzag
support_interface_skip_height = 0.15
support_offset = 0.8
support_z_distance = 0.2
wall_thickness = 0.8

1
resources/quality/flsun_sr/flsun_sr_fine.inst.cfg
View file

@ -65,7 +65,6 @@ support_interface_density = 60
support_interface_enable = True
support_interface_height = 0.96
support_interface_pattern = grid
support_interface_skip_height = 0.12
support_roof_density = 60
support_type = everywhere
support_wall_count = 1

1
resources/quality/flsun_sr/flsun_sr_normal.inst.cfg
View file

@ -65,7 +65,6 @@ support_interface_density = 60
support_interface_enable = True
support_interface_height = 0.6
support_interface_pattern = grid
support_interface_skip_height = 0.2
support_roof_density = 60
support_type = everywhere
support_wall_count = 1

1
resources/quality/flsun_v400/flsun_v400_normal.inst.cfg
View file

@ -100,7 +100,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 0.6
support_interface_pattern = lines
support_interface_skip_height = 0.2
support_pattern = zigzag
support_roof_density = 70
support_type = everywhere

1
resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg
View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

1
resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg
View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

1
resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg
View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

1
resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg
View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

1
resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg
View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

1
resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg
View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

1
resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg
View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

1
resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg
View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

1
resources/setting_visibility/expert.cfg
View file

@ -293,7 +293,6 @@ support_bottom_wall_count
support_interface_height
support_roof_height
support_bottom_height
support_interface_skip_height
support_interface_density
support_roof_density
support_bottom_density

1
resources/variants/arjun/arjun300_pva_0.2.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/arjun/arjun300_pva_0.3.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/arjun/arjun300_pva_0.4.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/arjun/arjun300_pva_0.5.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/arjun/arjun300_pva_0.6.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/arjun/arjun300_pva_0.8.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/arjun/arjunpro300_pva_0.2.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/arjun/arjunpro300_pva_0.3.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/arjun/arjunpro300_pva_0.4.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/arjun/arjunpro300_pva_0.5.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/arjun/arjunpro300_pva_0.6.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/arjun/arjunpro300_pva_0.8.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/kosher/kosher220_pva_0.2.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/kosher/kosher220_pva_0.3.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/kosher/kosher220_pva_0.4.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/kosher/kosher220_pva_0.5.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/kosher/kosher220_pva_0.6.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

1
resources/variants/kosher/kosher220_pva_0.8.inst.cfg
View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles