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

Merge branch 'main' into CURA-10896_improve_add_printer_wizard

Browse source
This commit is contained in:
Saumya Jain 2023-09-04 10:13:58 +02:00 • committed by GitHub
commit f3c7b0f6f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5514,7 +5514,9 @@
"unit": "mm",
"type": "float",
"default_value": 0.0,
"maximum_value": "extruderValue(support_extruder_nr, 'support_offset')",
"maximum_value": "extruderValue(support_extruder_nr, 'support_offset') if support_structure == 'normal' else None",
"minimum_value_warning": "-1 * machine_nozzle_size",
"maximum_value_warning": "10 * machine_nozzle_size",
"limit_to_extruder": "support_interface_extruder_nr",
"enabled": "support_interface_enable and (support_enable or support_meshes_present)",
"settable_per_mesh": false,
@ -5529,7 +5531,9 @@
"type": "float",
"default_value": 0.0,
"value": "extruderValue(support_roof_extruder_nr, 'support_interface_offset')",
"maximum_value": "extruderValue(support_extruder_nr, 'support_offset')",
"maximum_value": "extruderValue(support_extruder_nr, 'support_offset') if support_structure == 'normal' else None",
"minimum_value_warning": "-1 * machine_nozzle_size",
"maximum_value_warning": "10 * machine_nozzle_size",
"limit_to_extruder": "support_roof_extruder_nr",
"enabled": "support_roof_enable and (support_enable or support_meshes_present)",
"settable_per_mesh": false,
@ -5543,7 +5547,9 @@
"type": "float",
"default_value": 0.0,
"value": "extruderValue(support_bottom_extruder_nr, 'support_interface_offset')",
"maximum_value": "extruderValue(support_extruder_nr, 'support_offset')",
"maximum_value": "extruderValue(support_extruder_nr, 'support_offset') if support_structure == 'normal' else None",
"minimum_value_warning": "-1 * machine_nozzle_size",
"maximum_value_warning": "10 * machine_nozzle_size",
"limit_to_extruder": "support_bottom_extruder_nr",
"enabled": "support_bottom_enable and (support_enable or support_meshes_present)",
"settable_per_mesh": false,

5
resources/qml/Preferences/SettingVisibilityItem.qml
View file

@ -20,6 +20,7 @@ Item
width: childrenRect.width;
height: childrenRect.height;
id: checkboxTooltipArea
x: check.height
UM.CheckBox
{
id: check
@ -40,7 +41,7 @@ Item
{
width: height
height: check.height
anchors.left: checkboxTooltipArea.right
anchors.right: checkboxTooltipArea.left
anchors.leftMargin: 2 * screenScaleFactor
text:
@ -82,7 +83,7 @@ Item
source: UM.Theme.getIcon("Information")
color: UM.Theme.getColor("primary_button_text")
color: UM.Theme.getColor("small_button_text")
}
visible: provider.properties.enabled == "False"

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

@ -40,7 +40,7 @@ Item
Cura.TextField
{
id: filter
height: parent.height
implicitHeight: parent.height
anchors.left: parent.left
anchors.right: parent.right
topPadding: height / 4
@ -337,7 +337,7 @@ Item
}
function onShowTooltip(text) { base.showTooltip(delegate, Qt.point(-settingsView.x - UM.Theme.getSize("default_margin").width, 0), text) }
function onHideTooltip() { base.hideTooltip() }
function onShowAllHiddenInheritedSettings()
function onShowAllHiddenInheritedSettings(category_id)
{
var children_with_override = Cura.SettingInheritanceManager.getChildrenKeysWithOverride(category_id)
for(var i = 0; i < children_with_override.length; i++)