From 9b43ab3ad756de3d6f0e1e855bfc5af1928db21f Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 25 Jan 2022 09:05:08 +0100 Subject: [PATCH 01/56] reenable alternate_walls --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 3ef51c5a46..6f857e9ffb 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7913,7 +7913,7 @@ "description": "Alternate wall directions every other layer and inset. Useful for materials that can build up stress, like for metal printing.", "type": "bool", "default_value": false, - "enabled": false, + "enabled": true, "settable_per_mesh": true, "settable_per_extruder": true }, From 6d30596219668a105a70462db80e99d2540e764c Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 25 Jan 2022 09:05:13 +0100 Subject: [PATCH 02/56] Revert "Rename Optimize Wall Printing Order to Order Inner Walls By Inset." The original commit flipped the boolean of how optimize_wall_printing_order worked. The updated description was the opposite of the original meaning. However, the commit was performed without updating all profiles along with the flip in meaning of this setting. Let's flip it back in the frontend and also in the backend. This reverts commit bccf531aa6d13ddd87fe5f84ce71b09f71a17c0f. --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 6f857e9ffb..48fa4bb85f 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1198,8 +1198,8 @@ }, "optimize_wall_printing_order": { - "label": "Order Inner Walls By Inset", - "description": "Order inner wall printing by inset-index, instead of by (hole) region.", + "label": "Optimize Wall Printing Order", + "description": "Optimize the order in which walls are printed so as to reduce the number of retractions and the distance travelled. Most parts will benefit from this being enabled but some may actually take longer so please compare the print time estimates with and without optimization. First layer is not optimized when choosing brim as build plate adhesion type.", "type": "bool", "default_value": false, "settable_per_mesh": true From 7677f999ecaea0a60fabfa7e2c1782381a37b793 Mon Sep 17 00:00:00 2001 From: alexandr-vladimirov Date: Fri, 18 Feb 2022 00:09:04 +0530 Subject: [PATCH 03/56] Fix cura-build-environment link in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f58dc09a1..1090d13aa7 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Build scripts ------------- Please check out [cura-build](https://github.com/Ultimaker/cura-build) for detailed building instructions. -If you want to build the entire environment from scratch before building Cura as well, [cura-build-environment](https://github.com/Ultimaker/cura-build) might be a starting point before cura-build. (Again, see cura-build for more details.) +If you want to build the entire environment from scratch before building Cura as well, [cura-build-environment](https://github.com/Ultimaker/cura-build-environment) might be a starting point before cura-build. (Again, see cura-build for more details.) Running from Source ------------- From 58137e4987c088b4b4d578feb9740fc3ef847dd2 Mon Sep 17 00:00:00 2001 From: 10r3n20 Date: Fri, 18 Feb 2022 12:08:11 +0100 Subject: [PATCH 04/56] inverted y and z colors --- resources/themes/cura-dark/theme.json | 2 -- resources/themes/cura-light/theme.json | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 296d4d7145..2956e3f809 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -162,8 +162,6 @@ "tool_button_border": [255, 255, 255, 38], - "y_axis": [96, 96, 255, 255], - "viewport_background": [31, 36, 39, 255], "volume_outline": [12, 169, 227, 128], "buildplate": [169, 169, 169, 255], diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index ed0bdf832f..b4ae944f45 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -381,8 +381,8 @@ "disabled_axis": [127, 127, 127, 255], "x_axis": [218, 30, 40, 255], - "y_axis": [36, 162, 73, 255], - "z_axis": [25, 110, 240, 255], + "y_axis": [25, 110, 240, 255], + "z_axis": [36, 162, 73, 255], "all_axis": [255, 255, 255, 255], "viewport_background": [250, 250, 250, 255], From beae4f28f744c633cadcfa697e31ccf9a530215e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 21 Feb 2022 11:58:21 +0100 Subject: [PATCH 05/56] Change default sizes of menu CURA-8928 --- resources/qml/Widgets/Menu.qml | 2 +- resources/qml/Widgets/MenuItem.qml | 3 ++- resources/themes/cura-light/theme.json | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/qml/Widgets/Menu.qml b/resources/qml/Widgets/Menu.qml index 1a6aeff602..45af36d3fb 100644 --- a/resources/qml/Widgets/Menu.qml +++ b/resources/qml/Widgets/Menu.qml @@ -14,7 +14,7 @@ UM.Menu id: menu padding: 0 - implicitWidth: UM.Theme.getSize("setting_control").width + implicitWidth: UM.Theme.getSize("menu").width delegate: Cura.MenuItem {} background: Rectangle diff --git a/resources/qml/Widgets/MenuItem.qml b/resources/qml/Widgets/MenuItem.qml index f072c029ce..755f0717e2 100644 --- a/resources/qml/Widgets/MenuItem.qml +++ b/resources/qml/Widgets/MenuItem.qml @@ -13,7 +13,8 @@ UM.MenuItem { id: menuItem - implicitHeight: UM.Theme.getSize("setting_control").height + UM.Theme.getSize("narrow_margin").height + implicitHeight: UM.Theme.getSize("menu").height + UM.Theme.getSize("narrow_margin").height + implicitWidth: UM.Theme.getSize("menu").width opacity: enabled ? 1.0 : 0.5 arrow: UM.RecolorImage diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 293c5edf9e..d79a69dc9f 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -184,10 +184,12 @@ "primary_hover": [48, 182, 231, 255], "primary_text": [255, 255, 255, 255], "border": [127, 127, 127, 255], - "text_selection": [156,195, 255, 127], + "text_selection": [156, 195, 255, 127], "secondary": [240, 240, 240, 255], "secondary_shadow": [216, 216, 216, 255], + "text_lighter": [108, 108, 108, 255], + "icon": [8, 7, 63, 255], "primary_button": [25, 110, 240, 255], @@ -639,6 +641,7 @@ "message_action_button": [0, 2.5], "message_image": [15.0, 10.0], "message_type_icon": [2, 2], + "menu": [18, 2], "infill_button_margin": [0.5, 0.5], From 390d12495e61718059871a81a3c7f61ce5aae48b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 21 Feb 2022 13:08:53 +0100 Subject: [PATCH 06/56] Update highlight color of menu CURA-8928 --- resources/qml/Widgets/MenuItem.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/qml/Widgets/MenuItem.qml b/resources/qml/Widgets/MenuItem.qml index 755f0717e2..aacc5354cd 100644 --- a/resources/qml/Widgets/MenuItem.qml +++ b/resources/qml/Widgets/MenuItem.qml @@ -49,7 +49,6 @@ UM.MenuItem width: menuItem.width - 2 * UM.Theme.getSize("default_lining").width height: menuItem.height - 2 * UM.Theme.getSize("default_lining").height - color: menuItem.highlighted ? UM.Theme.getColor("setting_control_highlight") : "transparent" - border.color: menuItem.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent" + color: menuItem.highlighted ? UM.Theme.getColor("secondary"): UM.Theme.getColor("setting_control_highlight") } } \ No newline at end of file From 58d04420ed70b975296cab55a2caf18a1f60ca28 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 21 Feb 2022 13:13:27 +0100 Subject: [PATCH 07/56] Ensure that edit & help menu have the right styling They were still using the default Qt Menu instead of Cura.Menu CURA-8928 --- resources/qml/Menus/EditMenu.qml | 6 +++--- resources/qml/Menus/HelpMenu.qml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/qml/Menus/EditMenu.qml b/resources/qml/Menus/EditMenu.qml index c2ec9903f2..522c6b27d1 100644 --- a/resources/qml/Menus/EditMenu.qml +++ b/resources/qml/Menus/EditMenu.qml @@ -7,13 +7,13 @@ import QtQuick.Controls 2.1 import UM 1.6 as UM import Cura 1.0 as Cura -Menu +Cura.Menu { title: catalog.i18nc("@title:menu menubar:toplevel", "&Edit") Cura.MenuItem { action: Cura.Actions.undo } Cura.MenuItem { action: Cura.Actions.redo } - MenuSeparator { } + Cura.MenuSeparator { } Cura.MenuItem { action: Cura.Actions.selectAll } Cura.MenuItem { action: Cura.Actions.arrangeAll } Cura.MenuItem { action: Cura.Actions.multiplySelection } @@ -21,7 +21,7 @@ Menu Cura.MenuItem { action: Cura.Actions.deleteAll } Cura.MenuItem { action: Cura.Actions.resetAllTranslation } Cura.MenuItem { action: Cura.Actions.resetAll } - MenuSeparator { } + Cura.MenuSeparator { } Cura.MenuItem { action: Cura.Actions.groupObjects } Cura.MenuItem { action: Cura.Actions.mergeObjects } Cura.MenuItem { action: Cura.Actions.unGroupObjects } diff --git a/resources/qml/Menus/HelpMenu.qml b/resources/qml/Menus/HelpMenu.qml index e8a80eeced..4be25fdffe 100644 --- a/resources/qml/Menus/HelpMenu.qml +++ b/resources/qml/Menus/HelpMenu.qml @@ -8,7 +8,7 @@ import UM 1.5 as UM import Cura 1.0 as Cura -Menu +Cura.Menu { id: helpMenu title: catalog.i18nc("@title:menu menubar:toplevel", "&Help") From c3745b42b65ae3464b35935c34b8fb7c1477252f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 21 Feb 2022 13:15:09 +0100 Subject: [PATCH 08/56] Switch contextMenu to Cura.Menu This fixes all the styling issues that it still had CURA-8928 --- resources/qml/Menus/ContextMenu.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Menus/ContextMenu.qml b/resources/qml/Menus/ContextMenu.qml index 30e1d206f7..f25b3f70e5 100644 --- a/resources/qml/Menus/ContextMenu.qml +++ b/resources/qml/Menus/ContextMenu.qml @@ -8,7 +8,7 @@ import QtQuick.Window 2.1 import UM 1.5 as UM import Cura 1.0 as Cura -Menu +Cura.Menu { id: base From b79c77cb339893478c3f61aa93074386cb8f1cba Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 21 Feb 2022 13:20:04 +0100 Subject: [PATCH 09/56] Add left & right padding for MenuSeperator CURA-8928 --- resources/qml/Widgets/MenuSeparator.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/qml/Widgets/MenuSeparator.qml b/resources/qml/Widgets/MenuSeparator.qml index 04029844a2..ad79fccd6d 100644 --- a/resources/qml/Widgets/MenuSeparator.qml +++ b/resources/qml/Widgets/MenuSeparator.qml @@ -11,8 +11,10 @@ import UM 1.1 as UM // MenuSeparator { - padding: 0 - contentItem: Rectangle { + leftPadding: UM.Theme.getSize("default_margin").width + rightPadding: UM.Theme.getSize("default_margin").width + contentItem: Rectangle + { implicitHeight: UM.Theme.getSize("default_lining").height color: UM.Theme.getColor("setting_control_border") } From b0d944f92dcaa003292e895357f5cfd398997000 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 21 Feb 2022 13:21:51 +0100 Subject: [PATCH 10/56] Change all unstyled menuseperators to styled ones CURA-8928 --- resources/qml/Menus/FileMenu.qml | 6 +++--- resources/qml/Menus/PreferencesMenu.qml | 2 +- resources/qml/Menus/SettingsMenu.qml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/qml/Menus/FileMenu.qml b/resources/qml/Menus/FileMenu.qml index de5c4bfb90..338ada60fc 100644 --- a/resources/qml/Menus/FileMenu.qml +++ b/resources/qml/Menus/FileMenu.qml @@ -69,7 +69,7 @@ Cura.Menu enabled: UM.WorkspaceFileHandler.enabled } - MenuSeparator { } + Cura.MenuSeparator { } Cura.MenuItem { @@ -91,7 +91,7 @@ Cura.Menu onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file", PrintInformation.jobName, { "filter_by_machine": false, "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml"}) } - MenuSeparator { } + Cura.MenuSeparator { } Cura.MenuItem { @@ -99,7 +99,7 @@ Cura.Menu action: Cura.Actions.reloadAll } - MenuSeparator { } + Cura.MenuSeparator { } Cura.MenuItem { action: Cura.Actions.quit } } diff --git a/resources/qml/Menus/PreferencesMenu.qml b/resources/qml/Menus/PreferencesMenu.qml index fd0b5d82c1..3a6dd4b2ce 100644 --- a/resources/qml/Menus/PreferencesMenu.qml +++ b/resources/qml/Menus/PreferencesMenu.qml @@ -7,7 +7,7 @@ import QtQuick.Controls 2.4 import UM 1.5 as UM import Cura 1.0 as Cura -Menu +Cura.Menu { id: preferencesMenu diff --git a/resources/qml/Menus/SettingsMenu.qml b/resources/qml/Menus/SettingsMenu.qml index 6ee126890c..25bee871f5 100644 --- a/resources/qml/Menus/SettingsMenu.qml +++ b/resources/qml/Menus/SettingsMenu.qml @@ -39,7 +39,7 @@ Cura.Menu onAboutToHide: updateModels = false } - MenuSeparator + Cura.MenuSeparator { visible: Cura.MachineManager.activeMachine.hasVariants || Cura.MachineManager.activeMachine.hasMaterials } From 85926c6f7a962cdcda1de0af9039dea7282f1e3d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 21 Feb 2022 13:25:00 +0100 Subject: [PATCH 11/56] Add padding to menu CURA-8928 --- resources/qml/Widgets/Menu.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/Widgets/Menu.qml b/resources/qml/Widgets/Menu.qml index 45af36d3fb..0aa320df19 100644 --- a/resources/qml/Widgets/Menu.qml +++ b/resources/qml/Widgets/Menu.qml @@ -12,6 +12,8 @@ import Cura 1.0 as Cura UM.Menu { id: menu + topPadding: UM.Theme.getSize("narrow_margin").height + bottomPadding: UM.Theme.getSize("narrow_margin").height padding: 0 implicitWidth: UM.Theme.getSize("menu").width From 6e8c708f35bc7c0892504e92b59e5016b3015703 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 21 Feb 2022 13:26:14 +0100 Subject: [PATCH 12/56] Change genericMaterials menu to customized menu CURA-8928 --- resources/qml/Menus/MaterialMenu.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index 0834d7b250..da5d6a071b 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -72,7 +72,7 @@ Cura.Menu Cura.MenuSeparator { visible: favoriteMaterialsModel.items.length > 0} - Menu + Cura.Menu { id: genericMenu title: catalog.i18nc("@label:category menu label", "Generic") From 8cf9fe79416eb370f7362f2c59cbecf6793e644b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 10:55:22 +0100 Subject: [PATCH 13/56] Add noWrap to all labels in configurationMenu CURA-8941 --- resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index c9d0cd3e1b..6f7ee90733 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -207,6 +207,7 @@ Cura.ExpandablePopup text: model.material_name elide: Text.ElideRight width: parent.width + wrapMode: Text.NoWrap visible: !materialBrandNameLabel.visible && !truncated } @@ -217,6 +218,7 @@ Cura.ExpandablePopup text: model.material_type elide: Text.ElideRight width: parent.width + wrapMode: Text.NoWrap visible: !materialBrandNameLabel.visible && !materialNameLabel.visible } // Label that shows the name of the variant @@ -228,6 +230,7 @@ Cura.ExpandablePopup text: model.variant elide: Text.ElideRight + wrapMode: Text.NoWrap font: UM.Theme.getFont("default_bold") Layout.preferredWidth: parent.width } From b1f2f6af7537a1b7703498ff804ff7d48ca3f060 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 11:03:46 +0100 Subject: [PATCH 14/56] Add max values for int settings that didn't have them yet Fixes #11514 See also c8b491e9e7915b3e5534dee0d4576d7a1bafca20 --- resources/definitions/fdmprinter.def.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index dc01b0e585..d6b3405d2b 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1142,6 +1142,7 @@ "label": "Wall Distribution Count", "description": "The number of walls, counted from the center, over which the variation needs to be spread. Lower values mean that the outer walls don't change in width.", "type": "int", + "maximum_value": "999999", "default_value": 1, "minimum_value": "1", "enabled": "beading_strategy_type == 'inward_distributed'" @@ -1433,6 +1434,7 @@ "minimum_value": "0", "maximum_value_warning": "top_layers - 1", "type": "int", + "maximum_value": "999999", "value": "0", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true, @@ -1486,6 +1488,7 @@ "default_value": 8, "minimum_value": "0", "maximum_value_warning": "100", + "maximum_value": "999999", "type": "int", "minimum_value_warning": "2", "value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))", @@ -1516,6 +1519,7 @@ "minimum_value": "0", "minimum_value_warning": "2", "default_value": 6, + "maximum_value": "999999", "type": "int", "value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))", "limit_to_extruder": "top_bottom_extruder_nr", @@ -1527,6 +1531,7 @@ "description": "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number.", "minimum_value": "0", "minimum_value_warning": "2", + "maximum_value": "999999", "default_value": 6, "type": "int", "value": "bottom_layers", @@ -2048,6 +2053,7 @@ "description": "Convert each infill line to this many lines. The extra lines do not cross over each other, but avoid each other. This makes the infill stiffer, but increases print time and material usage.", "default_value": 1, "type": "int", + "maximum_value": "999999", "minimum_value": "1", "maximum_value_warning": "infill_line_distance / infill_line_width", "enabled": "infill_sparse_density > 0 and infill_pattern != 'zigzag' and (gradual_infill_steps == 0 or not zig_zaggify_infill)", @@ -2233,6 +2239,7 @@ "minimum_value": "0", "maximum_value_warning": "10", "type": "int", + "maximum_value": "999999", "value": "math.ceil(round(skin_edge_support_thickness / resolveOrValue('infill_sparse_thickness'), 4))", "limit_to_extruder": "infill_extruder_nr", "enabled": "infill_sparse_density > 0", @@ -3257,6 +3264,7 @@ "default_value": 2, "resolve": "round(sum(extruderValues('speed_slowdown_layers')) / len(extruderValues('speed_slowdown_layers')))", "minimum_value": "0", + "maximum_value": "999999", "maximum_value_warning": "3.2 / resolveOrValue('layer_height')", "settable_per_mesh": false, "settable_per_extruder": false From a14c160d866b29b8456fcb1a9a095171075523f8 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 11:28:33 +0100 Subject: [PATCH 15/56] Expose flickable direction for TableView CURA-8948 --- resources/qml/TableView.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/TableView.qml b/resources/qml/TableView.qml index 87f9fbdc05..0ceef11097 100644 --- a/resources/qml/TableView.qml +++ b/resources/qml/TableView.qml @@ -27,6 +27,7 @@ Item property bool allowSelection: true //Whether to allow the user to select items. property string sectionRole: "" + property alias flickableDirection: tableView.flickableDirection Row { id: headerBar From 25d2ed14dd2b2c0fcf9ea38f6f2d67aad1150dad Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 11:31:46 +0100 Subject: [PATCH 16/56] Ensure contentWidth is calculated correctly CURA-8948 --- resources/qml/TableView.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/TableView.qml b/resources/qml/TableView.qml index 0ceef11097..5e0b863f5a 100644 --- a/resources/qml/TableView.qml +++ b/resources/qml/TableView.qml @@ -129,6 +129,7 @@ Item } flickableDirection: Flickable.AutoFlickIfNeeded + contentWidth: -1 // AUto calculate the contendWidth clip: true ScrollBar.vertical: UM.ScrollBar {} columnWidthProvider: function(column) From 53331f4757e36c3dd86269efad8bf9710e143779 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 11:39:00 +0100 Subject: [PATCH 17/56] Remove unused imports --- .../Recommended/RecommendedAdhesionSelector.qml | 1 - .../PrintSetupSelector/Recommended/RecommendedPrintSetup.qml | 3 --- resources/qml/PrinterOutput/ExtruderBox.qml | 1 - resources/qml/ViewOrientationControls.qml | 2 -- 4 files changed, 7 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 08993b80a6..74c496f824 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -2,7 +2,6 @@ // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 -import QtQuick.Controls 1.4 import UM 1.5 as UM import Cura 1.0 as Cura diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index b91832cbbc..de8cce6e94 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -2,7 +2,6 @@ // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 -import QtQuick.Controls 1.4 import UM 1.2 as UM import Cura 1.0 as Cura @@ -13,8 +12,6 @@ Item height: childrenRect.height + 2 * padding - property Action configureSettings - property bool settingsEnabled: Cura.ExtruderManager.activeExtruderStackId || extrudersEnabledCount.properties.value == 1 property real padding: UM.Theme.getSize("thick_margin").width diff --git a/resources/qml/PrinterOutput/ExtruderBox.qml b/resources/qml/PrinterOutput/ExtruderBox.qml index 7ccab941b8..b36faf262d 100644 --- a/resources/qml/PrinterOutput/ExtruderBox.qml +++ b/resources/qml/PrinterOutput/ExtruderBox.qml @@ -3,7 +3,6 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 -import QtQuick.Controls.Styles 1.1 import QtQuick.Layouts 1.1 import UM 1.2 as UM diff --git a/resources/qml/ViewOrientationControls.qml b/resources/qml/ViewOrientationControls.qml index fc0f20fa77..ad3d184028 100644 --- a/resources/qml/ViewOrientationControls.qml +++ b/resources/qml/ViewOrientationControls.qml @@ -2,8 +2,6 @@ // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 -import QtQuick.Controls 1.1 -import QtQuick.Controls.Styles 1.1 import UM 1.4 as UM import Cura 1.1 as Cura From 40a4d617cc5517f1b1ead01940ede740d836caf6 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 11:40:23 +0100 Subject: [PATCH 18/56] Remove unused style --- resources/themes/cura-light/styles.qml | 28 -------------------------- 1 file changed, 28 deletions(-) diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml index 268d149546..45310c8589 100755 --- a/resources/themes/cura-light/styles.qml +++ b/resources/themes/cura-light/styles.qml @@ -9,34 +9,6 @@ import UM 1.1 as UM QtObject { - property Component scrollview: Component - { - ScrollViewStyle - { - decrementControl: Item { } - incrementControl: Item { } - - transientScrollBars: false - - scrollBarBackground: Rectangle - { - implicitWidth: UM.Theme.getSize("scrollbar").width - radius: Math.round(implicitWidth / 2) - color: UM.Theme.getColor("scrollbar_background") - } - - handle: Rectangle - { - id: scrollViewHandle - implicitWidth: UM.Theme.getSize("scrollbar").width - radius: Math.round(implicitWidth / 2) - - 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; } } - } - } - } - property Component partially_checkbox: Component { CheckBoxStyle From f347c6aedfe9d141e451bb74a72d7df1e9486476 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 11:42:41 +0100 Subject: [PATCH 19/56] Remove number of unused styles imports --- plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 1 - resources/qml/MonitorButton.qml | 1 - resources/qml/Preferences/Materials/MaterialsBrandSection.qml | 1 - resources/qml/Preferences/Materials/MaterialsTypeSection.qml | 1 - resources/qml/PrinterOutput/HeatedBedBox.qml | 1 - resources/qml/PrinterOutput/MonitorSection.qml | 1 - resources/qml/PrinterOutput/OutputDeviceHeader.qml | 1 - 7 files changed, 7 deletions(-) diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index 8bf39f6804..94016636db 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -3,7 +3,6 @@ import QtQuick 2.2 import QtQuick.Controls 2.15 -import QtQuick.Controls.Styles 1.2 import UM 1.5 as UM import Cura 1.0 as Cura diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml index 54b9437a6c..71d6031d96 100644 --- a/resources/qml/MonitorButton.qml +++ b/resources/qml/MonitorButton.qml @@ -3,7 +3,6 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 -import QtQuick.Controls.Styles 1.1 import QtQuick.Layouts 1.1 import UM 1.5 as UM diff --git a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml index 1e1ae088e8..7c853c8a05 100644 --- a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml +++ b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml @@ -3,7 +3,6 @@ import QtQuick 2.7 import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.3 import UM 1.5 as UM diff --git a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml index 0f438cf7e7..0a5d0e89e7 100644 --- a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml +++ b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml @@ -3,7 +3,6 @@ import QtQuick 2.7 import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.3 import UM 1.5 as UM diff --git a/resources/qml/PrinterOutput/HeatedBedBox.qml b/resources/qml/PrinterOutput/HeatedBedBox.qml index 12e24024c2..82a8d8c6b7 100644 --- a/resources/qml/PrinterOutput/HeatedBedBox.qml +++ b/resources/qml/PrinterOutput/HeatedBedBox.qml @@ -3,7 +3,6 @@ import QtQuick 2.10 import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.3 import UM 1.2 as UM diff --git a/resources/qml/PrinterOutput/MonitorSection.qml b/resources/qml/PrinterOutput/MonitorSection.qml index 1d9df777b6..2758853216 100644 --- a/resources/qml/PrinterOutput/MonitorSection.qml +++ b/resources/qml/PrinterOutput/MonitorSection.qml @@ -3,7 +3,6 @@ import QtQuick 2.10 import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.3 import UM 1.2 as UM diff --git a/resources/qml/PrinterOutput/OutputDeviceHeader.qml b/resources/qml/PrinterOutput/OutputDeviceHeader.qml index cbb9461778..9ad946b6af 100644 --- a/resources/qml/PrinterOutput/OutputDeviceHeader.qml +++ b/resources/qml/PrinterOutput/OutputDeviceHeader.qml @@ -1,7 +1,6 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 -import QtQuick.Controls.Styles 1.1 import QtQuick.Layouts 1.1 import UM 1.2 as UM From 2c6ba3cd5d4da8489ba98771a0be338032325a0f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 11:58:14 +0100 Subject: [PATCH 20/56] Update some USB printing items to controls 2 --- plugins/USBPrinting/MonitorItem.qml | 1 - resources/qml/MonitorButton.qml | 40 +++++++++---------- resources/qml/PrinterOutput/MonitorItem.qml | 12 ++---- .../qml/PrinterOutput/MonitorSection.qml | 8 +--- 4 files changed, 25 insertions(+), 36 deletions(-) diff --git a/plugins/USBPrinting/MonitorItem.qml b/plugins/USBPrinting/MonitorItem.qml index c86353f814..3ca8140107 100644 --- a/plugins/USBPrinting/MonitorItem.qml +++ b/plugins/USBPrinting/MonitorItem.qml @@ -3,7 +3,6 @@ import QtQuick 2.10 import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.3 import UM 1.2 as UM import Cura 1.0 as Cura diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml index 71d6031d96..6a64003185 100644 --- a/resources/qml/MonitorButton.qml +++ b/resources/qml/MonitorButton.qml @@ -2,15 +2,13 @@ //Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 -import QtQuick.Controls 1.1 -import QtQuick.Layouts 1.1 import UM 1.5 as UM import Cura 1.0 as Cura Item { - id: base; + id: base UM.I18nCatalog { id: catalog; name: "cura"} height: childrenRect.height + UM.Theme.getSize("thick_margin").height @@ -157,7 +155,7 @@ Item } } - Label + UM.Label { id: statusLabel width: parent.width - 2 * UM.Theme.getSize("thick_margin").width @@ -170,7 +168,7 @@ Item text: statusText } - Label + UM.Label { id: percentageLabel anchors.top: parent.top @@ -184,20 +182,20 @@ Item UM.ProgressBar { - id: progressBar; - minimumValue: 0; - maximumValue: 100; - value: 0; + id: progressBar + minimumValue: 0 + maximumValue: 100 + value: 0 //Doing this in an explicit binding since the implicit binding breaks on occasion. Binding { - target: progressBar; - property: "value"; - value: base.progress; + target: progressBar + property: "value" + value: base.progress } - visible: showProgress; + visible: showProgress indeterminate: { if(!printerConnected) @@ -217,15 +215,15 @@ Item return false; } } - property string backgroundColor: UM.Theme.getColor("progressbar_background"); - property string controlColor: base.statusColor; + property string backgroundColor: UM.Theme.getColor("progressbar_background") + property string controlColor: base.statusColor - width: parent.width - 2 * UM.Theme.getSize("thick_margin").width; - height: UM.Theme.getSize("progressbar").height; - anchors.top: statusLabel.bottom; - anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height / 4); - anchors.left: parent.left; - anchors.leftMargin: UM.Theme.getSize("thick_margin").width; + width: parent.width - 2 * UM.Theme.getSize("thick_margin").width + height: UM.Theme.getSize("progressbar").height + anchors.top: statusLabel.bottom + anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height / 4) + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("thick_margin").width } Row diff --git a/resources/qml/PrinterOutput/MonitorItem.qml b/resources/qml/PrinterOutput/MonitorItem.qml index a26ec20f64..4cf66630e9 100644 --- a/resources/qml/PrinterOutput/MonitorItem.qml +++ b/resources/qml/PrinterOutput/MonitorItem.qml @@ -2,18 +2,16 @@ // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 -import QtQuick.Controls 1.1 -import QtQuick.Controls.Styles 1.1 import QtQuick.Layouts 1.1 -import UM 1.2 as UM +import UM 1.5 as UM import Cura 1.0 as Cura Item { property string label: "" property string value: "" - height: childrenRect.height; + height: childrenRect.height property var connectedPrinter: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null @@ -24,22 +22,20 @@ Item anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width - Label + UM.Label { width: Math.floor(parent.width * 0.4) anchors.verticalCenter: parent.verticalCenter text: label color: connectedPrinter != null && connectedPrinter.acceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") - font: UM.Theme.getFont("default") elide: Text.ElideRight } - Label + UM.Label { width: Math.floor(parent.width * 0.6) anchors.verticalCenter: parent.verticalCenter text: value color: connectedPrinter != null && connectedPrinter.acceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") - font: UM.Theme.getFont("default") elide: Text.ElideRight } } diff --git a/resources/qml/PrinterOutput/MonitorSection.qml b/resources/qml/PrinterOutput/MonitorSection.qml index 2758853216..219be45d06 100644 --- a/resources/qml/PrinterOutput/MonitorSection.qml +++ b/resources/qml/PrinterOutput/MonitorSection.qml @@ -2,10 +2,8 @@ // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 -import UM 1.2 as UM +import UM 1.5 as UM import Cura 1.0 as Cura Item @@ -20,14 +18,12 @@ Item width: base.width height: UM.Theme.getSize("section").height - Label + UM.Label { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width text: label - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("setting_category_text") } } } From 4e880709a7fe4fc19599fe2b31a7e687459f4b8b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 12:03:53 +0100 Subject: [PATCH 21/56] Remove styles.qml We no longer need / have styles due to upgrade to qt 6.2 --- resources/themes/cura-light/styles.qml | 61 -------------------------- 1 file changed, 61 deletions(-) delete mode 100755 resources/themes/cura-light/styles.qml diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml deleted file mode 100755 index 45310c8589..0000000000 --- a/resources/themes/cura-light/styles.qml +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) 2022 Ultimaker B.V. -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.10 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 - -import UM 1.1 as UM - -QtObject -{ - property Component partially_checkbox: Component - { - CheckBoxStyle - { - background: Item { } - indicator: Rectangle - { - implicitWidth: UM.Theme.getSize("checkbox").width - implicitHeight: UM.Theme.getSize("checkbox").height - - 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(UM.Theme.getSize("checkbox").width / 2) : UM.Theme.getSize("checkbox_radius").width - - 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 - { - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - width: Math.round(parent.width / 2.5) - height: Math.round(parent.height / 2.5) - sourceSize.height: width - color: UM.Theme.getColor("checkbox_mark") - source: - { - if (control.checkbox_state == 2) - { - return UM.Theme.getIcon("Solid"); - } - else - { - return control.exclusiveGroup ? UM.Theme.getIcon("Dot", "low") : UM.Theme.getIcon("Check"); - } - } - opacity: control.checked - Behavior on opacity { NumberAnimation { duration: 100; } } - } - } - label: Label - { - text: control.text - color: UM.Theme.getColor("checkbox_text") - font: UM.Theme.getFont("default") - } - } - } -} From 209ca566cdc2f46e8b80239dbd2e942239a3aafc Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Tue, 22 Feb 2022 14:16:40 +0100 Subject: [PATCH 22/56] update definitions of ultimaker2+C, S3 and S5 These printers have the same feeder and therefore share the same retract settings. The retract speed is set high by default and the unretract speed low by default. This is a safe and good default. PP-96 --- resources/definitions/ultimaker2_plus_connect.def.json | 4 +++- resources/definitions/ultimaker_s3.def.json | 1 + resources/definitions/ultimaker_s5.def.json | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 1927ed20f9..186637b487 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -84,6 +84,8 @@ "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "meshfix_maximum_travel_resolution": { "value": 0.5 }, - "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" } + "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, + "retraction_prime_speed": { "value": "15" }, + "retraction_speed": {"value": "45" } } } diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 6ecf2fe848..034a2d78d4 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -136,6 +136,7 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, + "retraction_speed": {"value": "45" }, "skin_overlap": { "value": "10" }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index ea58cfef33..36aa311c23 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -138,6 +138,7 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, + "retraction_speed": {"value": "45" }, "skin_overlap": { "value": "10" }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, From 9e96a6edc92a39c63499f6b88bfacc0a6dd5ce02 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Tue, 22 Feb 2022 14:18:57 +0100 Subject: [PATCH 23/56] small nozzle size handles fast unretract very well This statement is already in the S3 and S5 AA0.25 nozzle cfg file. PP-96 --- resources/variants/ultimaker2_plus_connect_0.25.inst.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg b/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg index e20ced7a3e..36d98a5d8f 100644 --- a/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg +++ b/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg @@ -14,6 +14,7 @@ coasting_volume = 0.1 machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 0.8 raft_airgap = 0.25 +retraction_prime_speed = =retraction_speed speed_topbottom = =round(speed_print / 1.5, 1) speed_wall = =round(speed_print / 1.2, 1) speed_wall_0 = =1 if speed_wall < 5 else (speed_wall - 5) From cc56f7b577742f2d6196a12d91f3dae2ee147d45 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Tue, 22 Feb 2022 14:20:16 +0100 Subject: [PATCH 24/56] dont change behaviour of AA08 nozzles The retract behaviour for the bigger nozzles is not that good already. We want to take a look at these profiles later and leave them untouched for now. PP-96 --- resources/variants/ultimaker2_plus_connect_0.8.inst.cfg | 2 ++ resources/variants/ultimaker_s3_aa0.8.inst.cfg | 1 + resources/variants/ultimaker_s5_aa0.8.inst.cfg | 1 + 3 files changed, 4 insertions(+) diff --git a/resources/variants/ultimaker2_plus_connect_0.8.inst.cfg b/resources/variants/ultimaker2_plus_connect_0.8.inst.cfg index 5557af03e9..99674d2375 100644 --- a/resources/variants/ultimaker2_plus_connect_0.8.inst.cfg +++ b/resources/variants/ultimaker2_plus_connect_0.8.inst.cfg @@ -12,6 +12,8 @@ hardware_type = nozzle machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 1.35 coasting_volume = 3.22 +retraction_speed = 25 +retraction_prime_speed = =retraction_speed speed_wall = =round(speed_print * 3 / 4, 1) speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) speed_topbottom = =round(speed_print / 2, 1) diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg index 5b19f224b4..3bc112c7fa 100644 --- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg @@ -39,6 +39,7 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 +retraction_speed = 25 skin_overlap = 5 speed_layer_0 = 20 speed_print = 35 diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg index c36d96066d..75581681f9 100644 --- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg @@ -39,6 +39,7 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 +retraction_speed = 25 skin_overlap = 5 speed_layer_0 = 20 speed_print = 35 From fe6a8413c1c83cd169695e60d50008eb041ecbdc Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Tue, 22 Feb 2022 14:22:01 +0100 Subject: [PATCH 25/56] follow the machine defaults for AA04 nozzles The machine defaults are already geared towards the use of AA0.4 nozzles. PP-96 --- resources/variants/ultimaker_s3_aa04.inst.cfg | 1 - resources/variants/ultimaker_s5_aa04.inst.cfg | 1 - 2 files changed, 2 deletions(-) diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg index 38f4c226f5..9e56a0e75e 100644 --- a/resources/variants/ultimaker_s3_aa04.inst.cfg +++ b/resources/variants/ultimaker_s3_aa04.inst.cfg @@ -25,7 +25,6 @@ raft_surface_layers = 2 retraction_amount = 6.5 retraction_count_max = 25 retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed skin_overlap = 15 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg index e976f1071d..923d8cadec 100644 --- a/resources/variants/ultimaker_s5_aa04.inst.cfg +++ b/resources/variants/ultimaker_s5_aa04.inst.cfg @@ -25,7 +25,6 @@ raft_surface_layers = 2 retraction_amount = 6.5 retraction_count_max = 25 retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed skin_overlap = 15 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) From 5632d85339b5247e40426511880efe24dbb40229 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Tue, 22 Feb 2022 14:22:49 +0100 Subject: [PATCH 26/56] PVA can handle high unretract speeds Even for the bigger nozzle. PP-96 --- resources/variants/ultimaker_s3_bb0.8.inst.cfg | 1 - resources/variants/ultimaker_s5_bb0.8.inst.cfg | 1 - 2 files changed, 2 deletions(-) diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index 2affa6d01b..5f6373338b 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -54,7 +54,6 @@ retraction_extrusion_window = =retraction_amount retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 3 -retraction_prime_speed = 15 skin_overlap = 5 speed_layer_0 = 20 speed_print = 35 diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index 89aadaae54..4c43f2da26 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -54,7 +54,6 @@ retraction_extrusion_window = =retraction_amount retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 3 -retraction_prime_speed = 15 skin_overlap = 5 speed_layer_0 = 20 speed_print = 35 From 9b35dc18b55b283567de96adbe16100a4cc98e94 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Tue, 22 Feb 2022 14:24:47 +0100 Subject: [PATCH 27/56] material specific exceptions on the defaults Some materials can handle higher unretract speeds. Also some unnecessary overwrites of the defaults are removed. PP-96 --- .../ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg | 5 +++-- .../ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg | 5 +++-- .../ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg | 5 +++-- .../ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg | 3 ++- .../ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg | 5 +++-- .../ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg | 5 +++-- .../ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg | 5 +++-- .../ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg | 5 +++-- .../ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg | 1 + .../ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg | 1 + .../ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg | 1 + .../ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg | 1 + .../ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg | 1 + .../ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg | 1 + .../ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg | 1 + .../ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg | 1 + .../ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg | 1 + .../ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg | 1 - .../ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg | 1 - .../ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg | 1 - .../ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg | 1 - .../ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg | 1 + .../ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg | 1 + .../ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg | 1 + .../ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg | 1 + .../quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg | 1 + .../quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg | 1 + .../quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg | 1 + .../quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg | 1 + .../quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg | 1 + .../quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg | 1 + .../quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg | 1 + .../quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg | 1 - 96 files changed, 82 insertions(+), 46 deletions(-) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg index 45f350cdbd..0ab179959f 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg @@ -17,6 +17,8 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 20 +retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 45) speed_print = 45 speed_travel = 150 @@ -26,5 +28,4 @@ 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 +speed_infill = =math.ceil(speed_print * 45 / 45) \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg index 3d0e9f6abd..dc4b06940c 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg @@ -17,11 +17,12 @@ cool_min_layer_time = 2 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 15 infill_sparse_density = 20 +retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 45) speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) top_bottom_thickness = 0.72 wall_thickness = 1.05 speed_topbottom = =math.ceil(speed_print * 15 / 45) -speed_infill = =math.ceil(speed_print * 45 / 45) -retraction_combing_max_distance = 50 +speed_infill = =math.ceil(speed_print * 45 / 45) \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg index ab5559b322..2ea0c4a828 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg @@ -17,9 +17,10 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 20 +retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 45) 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 +wall_thickness = 1.05 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg index 286474454b..60642a3c69 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg @@ -17,8 +17,9 @@ cool_min_layer_time = 5 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 8 infill_sparse_density = 20 +retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 40) 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_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg index d37743423b..fdaecf1142 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg @@ -26,6 +26,8 @@ raft_interface_line_spacing = 1 raft_interface_line_width = 0.8 raft_margin = 15 raft_surface_line_width = 0.38 +retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 20 / 25) @@ -37,5 +39,4 @@ support_infill_rate = =0 if support_enable and support_structure == 'tree' else support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.5 -wall_thickness = 1.14 -retraction_combing_max_distance = 50 \ No newline at end of file +wall_thickness = 1.14 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg index a0fd902e31..b9845f7002 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg @@ -26,6 +26,8 @@ raft_interface_line_spacing = 1 raft_interface_line_width = 0.8 raft_margin = 15 raft_surface_line_width = 0.38 +retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 15 / 35) speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) @@ -37,5 +39,4 @@ support_infill_rate = =0 if support_enable and support_structure == 'tree' else support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.5 -wall_thickness = 1.14 -retraction_combing_max_distance = 50 \ No newline at end of file +wall_thickness = 1.14 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg index b96242f569..965182eb4d 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg @@ -27,6 +27,8 @@ raft_interface_line_width = 1.2 raft_margin = 15 raft_surface_line_width = 0.57 raft_surface_thickness = 0.2 +retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 50) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 20 / 25) @@ -41,5 +43,4 @@ support_pattern = lines support_xy_distance = 0.6 support_z_distance = 0.22 top_bottom_thickness = 0.75 -wall_thickness = 1.14 -retraction_combing_max_distance = 50 \ No newline at end of file +wall_thickness = 1.14 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg index 58e7974fe6..817635d4fd 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg @@ -27,6 +27,8 @@ raft_interface_line_width = 1.2 raft_margin = 15 raft_surface_line_width = 0.57 raft_surface_thickness = 0.2 +retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 30 / 35) speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) @@ -41,5 +43,4 @@ support_pattern = lines support_xy_distance = 0.6 support_z_distance = 0.22 top_bottom_thickness = 0.75 -wall_thickness = 1.14 -retraction_combing_max_distance = 50 \ No newline at end of file +wall_thickness = 1.14 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg index b9074df494..2358657ab3 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg @@ -26,6 +26,7 @@ raft_interface_line_width = 0.8 raft_margin = 15 raft_surface_line_width = 0.5 raft_surface_thickness = 0.15 +retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 30 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg index 1986a09fc7..5a9283faff 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg @@ -26,6 +26,7 @@ raft_interface_line_width = 0.8 raft_margin = 15 raft_surface_line_width = 0.5 raft_surface_thickness = 0.15 +retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 30 / 45) speed_print = 45 speed_travel = 150 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg index 78cf8fd15d..18fe82d680 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg @@ -27,6 +27,7 @@ raft_margin = 15 raft_surface_line_width = 0.6 raft_surface_thickness = 0.15 retraction_hop_enabled = 0.2 +retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 30 / 55) speed_print = 55 speed_support = 40 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg index 1b38f220e2..8685edd405 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg @@ -27,6 +27,7 @@ raft_margin = 15 raft_surface_line_width = 0.6 raft_surface_thickness = 0.15 retraction_hop_enabled = 0.2 +retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 30 / 55) speed_print = 55 speed_support = 40 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg index c03d3ca7c3..94562f422d 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg @@ -15,6 +15,7 @@ variant = 0.4 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 20 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 60) speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg index a267ce002a..43a5cb6596 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg @@ -15,6 +15,7 @@ variant = 0.4 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 20 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 60) speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg index 3a44812078..c7c7753cf2 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg @@ -15,6 +15,7 @@ variant = 0.4 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 20 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 20 / 50) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg index f85c61b885..2b3c24a912 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg @@ -15,6 +15,7 @@ variant = 0.4 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 20 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 20 / 50) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg index 4f77e995d4..8f3079c4f4 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg @@ -15,6 +15,7 @@ variant = 0.6 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 20 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 20 / 55) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg index 077ce01713..a7dad05ae9 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg @@ -45,7 +45,6 @@ retraction_hop = 0.15 retraction_hop_enabled = True retraction_hop_only_when_collides = True retraction_min_travel = 0.5 -retraction_prime_speed = 15 skin_overlap = 10 speed_layer_0 = =speed_print speed_prime_tower = =speed_topbottom diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg index 9e827e0da6..6f9612ff9a 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg @@ -45,7 +45,6 @@ retraction_hop = 0.15 retraction_hop_enabled = True retraction_hop_only_when_collides = True retraction_min_travel = 0.5 -retraction_prime_speed = 15 skin_overlap = 10 speed_layer_0 = =speed_print speed_prime_tower = =speed_topbottom diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg index afc75d1238..7c94a57190 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg @@ -44,7 +44,6 @@ retraction_extrusion_window = 1 retraction_hop = 0.15 retraction_hop_enabled = True retraction_hop_only_when_collides = True -retraction_prime_speed = 15 skin_overlap = 10 speed_layer_0 = =speed_print speed_prime_tower = =speed_topbottom diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg index 52b963bb90..6e2a8960bd 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg @@ -44,7 +44,6 @@ retraction_extrusion_window = 1 retraction_hop = 0.15 retraction_hop_enabled = True retraction_hop_only_when_collides = True -retraction_prime_speed = 15 skin_overlap = 10 speed_layer_0 = =speed_print speed_prime_tower = =speed_topbottom diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg index ab146869d9..4161bd3781 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg @@ -15,6 +15,7 @@ variant = 0.4 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 20 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg index a985f0c797..b26340fdb2 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg @@ -15,6 +15,7 @@ variant = 0.4 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 20 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg index 7da9e7165c..a4ee94c36c 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg @@ -15,6 +15,7 @@ variant = 0.4 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 20 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 speed_topbottom = =math.ceil(speed_print * 20 / 40) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg index 1fd07a8c85..173b551e8b 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg @@ -15,6 +15,7 @@ variant = 0.6 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 20 +retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 20 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg index 08a82f1d5d..f3cc0937a0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg @@ -15,6 +15,5 @@ variant = AA 0.25 cool_fan_speed = 40 infill_overlap = =0 if infill_sparse_density > 80 else 15 material_final_print_temperature = =material_print_temperature - 5 -retraction_prime_speed = 25 speed_topbottom = =math.ceil(speed_print * 30 / 55) wall_thickness = 0.92 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg index 47119e62bf..59423682f1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg @@ -34,7 +34,6 @@ retraction_count_max = 80 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 15 skin_overlap = 30 speed_layer_0 = =math.ceil(speed_print * 25 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg index e426ee3efd..2f6c5f2888 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg @@ -37,7 +37,7 @@ retraction_extrusion_window = 6.5 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 13 +retraction_prime_speed = 15 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_travel_layer_0 = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg index d0e6e36ea3..1aad4c498f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -32,6 +32,7 @@ retraction_extrusion_window = 1 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True +retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg index 51f90c6c8f..1172267ed4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -32,6 +32,7 @@ retraction_extrusion_window = 1 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True +retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg index e5241c36c6..19b5094f03 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg @@ -34,6 +34,7 @@ retraction_extrusion_window = 1 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True +retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 40) speed_print = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg index 155001b888..a282ca7222 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -34,6 +34,7 @@ retraction_extrusion_window = 1 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True +retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 40) speed_print = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg index 1a6ae612ce..7c42d02ada 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg @@ -16,6 +16,7 @@ material_print_temperature = =default_material_print_temperature + 10 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 60) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg index f0b55841f3..c5641afd64 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg @@ -17,6 +17,7 @@ material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg index fdbe5fb1d6..a6ee66b17e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg @@ -19,6 +19,7 @@ material_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_print = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg index 9bffd6f794..e888cf8ae0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -17,6 +17,7 @@ machine_nozzle_heat_up_speed = 1.5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_print = 55 speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg index 5bc7246093..5fb23190d1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg @@ -28,6 +28,7 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg index 614254e9d9..a46e184d05 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg @@ -28,6 +28,7 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg index 3a11b6dbe3..50d885b55f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg @@ -27,6 +27,7 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg index a5abd1bab6..84aebaf798 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -27,6 +27,7 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg index 69bbcf001d..f4bb4ba024 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg @@ -43,7 +43,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 15 skin_overlap = 30 speed_layer_0 = =math.ceil(speed_print * 25 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg index 63568363d2..ece85f2168 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg @@ -41,7 +41,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 15 skin_overlap = 30 speed_layer_0 = =math.ceil(speed_print * 25 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg index 3a317c820e..0caf9b1cd6 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg @@ -43,7 +43,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 15 skin_overlap = 30 speed_layer_0 = =math.ceil(speed_print * 25 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg index 8b264ad751..751942b0f9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg @@ -41,7 +41,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 15 skin_overlap = 30 speed_layer_0 = =math.ceil(speed_print * 25 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg index 7ca3b04031..d5a5be70f8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg @@ -19,6 +19,7 @@ machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 40 / 70) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg index 38741f40ff..d274eaffd3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg @@ -18,6 +18,7 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed speed_print = 70 speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 35 / 70) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg index 871ab6adc8..2f54d272fe 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg @@ -20,6 +20,7 @@ machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_print = 50 speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg index 7c8b71cd68..2c23a4ae71 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -19,6 +19,7 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_layer_0 = 10 top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg index 1f005ff77a..362d9ef5b9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -34,6 +34,7 @@ machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_edge_support_thickness = =0.9 if infill_sparse_density < 30 else 0 skin_overlap = 20 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg index 816eaeda5d..b59e2537e3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg @@ -42,7 +42,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 18 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg index 498bdd6bd5..3b3ff5b463 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg @@ -41,7 +41,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 18 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg index 28b1470419..2530ca9490 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg @@ -43,7 +43,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 18 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg index 2201b135b1..a3d1d1f255 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -23,6 +23,7 @@ machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg index b97bdbece7..cb2d019fdc 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -20,6 +20,7 @@ machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg index 262a1593a3..32ae7fbd53 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg @@ -20,6 +20,7 @@ machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_print = 45 speed_layer_0 = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg index c438fd2a93..a81a3b9f08 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -21,6 +21,7 @@ machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg index f00bf89dc6..bda8ad2775 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -34,6 +34,7 @@ machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_edge_support_thickness = =0.9 if infill_sparse_density < 30 else 0 skin_overlap = 20 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg index 0a01d45a0c..8b0b8abf0c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg @@ -41,7 +41,6 @@ retraction_extra_prime_amount = 0.8 retraction_extrusion_window = 1 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 -retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 18 / 25) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg index 18c5c014f8..0f4a416273 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg @@ -41,7 +41,6 @@ retraction_extra_prime_amount = 0.8 retraction_extrusion_window = 1 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 -retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 18 / 25) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg index 536f766916..2b0b1c1720 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -40,7 +40,6 @@ retraction_extra_prime_amount = 0.8 retraction_extrusion_window = 1 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 -retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 18 / 25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg index efacf651ab..c1d936a7a7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg @@ -15,6 +15,5 @@ variant = AA 0.25 cool_fan_speed = 40 infill_overlap = =0 if infill_sparse_density > 80 else 15 material_final_print_temperature = =material_print_temperature - 5 -retraction_prime_speed = 25 speed_topbottom = =math.ceil(speed_print * 30 / 55) wall_thickness = 0.92 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg index ee3750680f..2b6121e9ee 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg @@ -34,7 +34,6 @@ retraction_count_max = 80 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 15 skin_overlap = 30 speed_layer_0 = =math.ceil(speed_print * 25 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg index 07aa9462e1..9870b07ab4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg @@ -37,7 +37,7 @@ retraction_extrusion_window = 6.5 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 13 +retraction_prime_speed = 15 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_travel_layer_0 = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg index f6927953d1..26dc7ea9c3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg @@ -32,6 +32,7 @@ retraction_extrusion_window = 1 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True +retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg index ffb22e619d..4b3fcd3fd9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg @@ -32,6 +32,7 @@ retraction_extrusion_window = 1 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True +retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg index 262e6583a2..6fc1c398c4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg @@ -34,6 +34,7 @@ retraction_extrusion_window = 1 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True +retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 40) speed_print = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg index a11519fb05..4f7901cd52 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -33,6 +33,7 @@ retraction_extrusion_window = 1 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True +retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 40) speed_print = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg index 6c1a3a45af..3f3ce3ce79 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg @@ -16,6 +16,7 @@ material_print_temperature = =default_material_print_temperature + 10 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0 skin_overlap = 20 speed_print = 60 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg index 71c25958fa..cbabc4d432 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg @@ -17,6 +17,7 @@ material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg index 9692faac22..86c81a14a2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg @@ -19,6 +19,7 @@ material_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_print = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg index 5698375c63..62163c286e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg @@ -17,6 +17,7 @@ machine_nozzle_heat_up_speed = 1.5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 +retraction_prime_speed = =retraction_speed speed_print = 55 speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg index 9a02eeede4..58d05433c0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg @@ -26,6 +26,7 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg index 01859d49a1..26a74aae03 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg @@ -28,6 +28,7 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg index c25a46ce20..8a6d7bdca2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg @@ -27,6 +27,7 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg index 321c369975..4976153044 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -27,6 +27,7 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg index 2fdc113b3c..601d1164fd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg @@ -42,7 +42,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 15 skin_overlap = 30 speed_layer_0 = =math.ceil(speed_print * 25 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg index 9adceaa9cd..cad4e25f95 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg @@ -41,7 +41,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 15 skin_overlap = 30 speed_layer_0 = =math.ceil(speed_print * 25 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg index 65364d955a..6cc4d15e73 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg @@ -43,7 +43,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 15 skin_overlap = 30 speed_layer_0 = =math.ceil(speed_print * 25 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg index e6adcfaf22..093a04b8a2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg @@ -41,7 +41,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 15 skin_overlap = 30 speed_layer_0 = =math.ceil(speed_print * 25 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg index fcc7ce6278..f339aa3988 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg @@ -19,6 +19,7 @@ machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0 skin_overlap = 20 speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg index 27df25d5d5..206442121b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg @@ -18,6 +18,7 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed speed_print = 70 speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 35 / 70) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg index 9df48afa7b..3f29983cfd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg @@ -20,6 +20,7 @@ machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_print = 50 speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg index b3d096ed71..227730f359 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg @@ -19,6 +19,7 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_layer_0 = 10 top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg index 376cebd718..141c4604b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -34,6 +34,7 @@ machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_edge_support_thickness = =0.9 if infill_sparse_density < 30 else 0 skin_overlap = 20 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg index 3acfe41222..8c8091cb1e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg @@ -43,7 +43,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 18 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg index 4f7e5c5860..047ee82739 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg @@ -43,7 +43,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 18 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg index b2b03b494d..c91c73983e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg @@ -43,7 +43,6 @@ retraction_extrusion_window = 1 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 -retraction_prime_speed = 18 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg index ef698a68e6..d65f61cf74 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg @@ -23,6 +23,7 @@ machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg index e66b376515..bea0ca9228 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg @@ -20,6 +20,7 @@ machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg index cb9e545007..190f2f8e06 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg @@ -20,6 +20,7 @@ machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_print = 45 speed_layer_0 = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg index 405fd35825..190f3422b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -21,6 +21,7 @@ machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg index bd3193df37..9e614cdd28 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -34,6 +34,7 @@ machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 prime_tower_enable = False +retraction_prime_speed = =retraction_speed skin_edge_support_thickness = =0.9 if infill_sparse_density < 30 else 0 skin_overlap = 20 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg index 30eb73204b..a867e168b1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg @@ -41,7 +41,6 @@ retraction_extra_prime_amount = 0.8 retraction_extrusion_window = 1 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 -retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 18 / 25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg index b63ecbdad8..f4ef171a69 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg @@ -41,7 +41,6 @@ retraction_extra_prime_amount = 0.8 retraction_extrusion_window = 1 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 -retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 18 / 25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg index ff25dd69a9..ce9b26051e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg @@ -40,7 +40,6 @@ retraction_extra_prime_amount = 0.8 retraction_extrusion_window = 1 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 -retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 18 / 25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg index a400721d90..99511e1ab6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -34,7 +34,6 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 -retraction_prime_speed = 15 speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =math.ceil(speed_print * 30 / 30) From 5d28994b8723809e4cf19af86f4972886cd6acb4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 14:47:27 +0100 Subject: [PATCH 28/56] Use cura styled combobox --- resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml index 18517d5e96..f6124147a2 100644 --- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml @@ -89,10 +89,9 @@ UM.Dialog buttonSpacing: UM.Theme.getSize("thin_margin").width leftButtons: [ - ComboBox + Cura.ComboBox { id: discardOrKeepProfileChangesDropDownButton - width: 300 textRole: "text" model: ListModel From 80f99b0a598bcd6b9cf5e39a3d6f25e219cad9c6 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 15:03:57 +0100 Subject: [PATCH 29/56] Fix positioning of marketplace searchbar CURA-8762 --- plugins/Marketplace/resources/qml/Marketplace.qml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index fc6d3cd755..a2ffd9fa25 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -98,20 +98,14 @@ Window Item { Layout.preferredHeight: childrenRect.height - Layout.preferredWidth: parent.width - 2 * UM.Theme.getSize("thin_margin").width + Layout.preferredWidth: parent.width - 2 * UM.Theme.getSize("default_margin").width + Layout.alignment: Qt.AlignHCenter RowLayout { width: parent.width height: UM.Theme.getSize("button_icon").height + UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("thin_margin").width - Item - { - Layout.preferredHeight: parent.height - Layout.preferredWidth: searchBar.visible ? UM.Theme.getSize("thin_margin").width : 0 - Layout.fillWidth: ! searchBar.visible - } - Cura.SearchBar { id: searchBar From adfb78e38abf54e0e95c42007cca3f44137a7345 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 15:11:11 +0100 Subject: [PATCH 30/56] Fix spacing CURA-8762 --- plugins/Marketplace/resources/qml/Marketplace.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index a2ffd9fa25..ebb3bd26a5 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -59,7 +59,7 @@ Window { id: packageBrowse - spacing: UM.Theme.getSize("default_margin").height + spacing: UM.Theme.getSize("narrow_margin").height // Page title. Item From 0b39fb1c916861fbab9a1c21225449b29ff01751 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 15:18:49 +0100 Subject: [PATCH 31/56] Hide download count in manage page CURA-8726 --- plugins/Marketplace/resources/qml/PackageCardHeader.qml | 2 +- plugins/Marketplace/resources/qml/PackagePage.qml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/Marketplace/resources/qml/PackageCardHeader.qml b/plugins/Marketplace/resources/qml/PackageCardHeader.qml index 3a76f7a959..d6289f8ce1 100644 --- a/plugins/Marketplace/resources/qml/PackageCardHeader.qml +++ b/plugins/Marketplace/resources/qml/PackageCardHeader.qml @@ -12,7 +12,7 @@ import Cura 1.6 as Cura // are combined into the reusable "PackageCardHeader" component Item { - default property alias contents: contentItem.children; + default property alias contents: contentItem.children property var packageData property bool showManageButtons: false diff --git a/plugins/Marketplace/resources/qml/PackagePage.qml b/plugins/Marketplace/resources/qml/PackagePage.qml index 21c400fff2..00e022dc20 100644 --- a/plugins/Marketplace/resources/qml/PackagePage.qml +++ b/plugins/Marketplace/resources/qml/PackagePage.qml @@ -40,7 +40,7 @@ Rectangle id: downloadCount Layout.preferredWidth: parent.width Layout.fillHeight: true - + visible: packageData.downloadCount != "0" UM.RecolorImage { id: downloadsIcon @@ -53,6 +53,7 @@ Rectangle Label { + anchors.verticalCenter: downloadsIcon.verticalCenter color: UM.Theme.getColor("text") From 5d0454c1809668f63ccec00f03af36f90a8da0d5 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 22 Feb 2022 15:29:08 +0100 Subject: [PATCH 32/56] Revert "reenable alternate_walls" This reverts commit 9b43ab3ad756de3d6f0e1e855bfc5af1928db21f. The material_alternate_walls setting was supposed to be disabled. Something to do with hardware. See CURA- 8079 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 48fa4bb85f..cd7f69460c 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7913,7 +7913,7 @@ "description": "Alternate wall directions every other layer and inset. Useful for materials that can build up stress, like for metal printing.", "type": "bool", "default_value": false, - "enabled": true, + "enabled": false, "settable_per_mesh": true, "settable_per_extruder": true }, From a05650f64c03fc9df8cb4bfb3afa2ac00be48414 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 15:44:30 +0100 Subject: [PATCH 33/56] Fix margins for OnboardBanner Re-usable components shouldn't really be setting layout themselves. This should be done by whomever creates them. The actual fix is that the banner no longe sets all margins, only left & right CURA-8726 --- plugins/Marketplace/resources/qml/Marketplace.qml | 4 ++++ plugins/Marketplace/resources/qml/OnboardBanner.qml | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index ebb3bd26a5..796c537640 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -92,6 +92,10 @@ Window icon: content.item && content.item.bannerIcon onRemove: content.item && content.item.onRemoveBanner readMoreUrl: content.item && content.item.bannerReadMoreUrl + + Layout.fillWidth: true + Layout.leftMargin: UM.Theme.getSize("default_margin").width + Layout.rightMargin: UM.Theme.getSize("default_margin").width } // Search & Top-Level Tabs diff --git a/plugins/Marketplace/resources/qml/OnboardBanner.qml b/plugins/Marketplace/resources/qml/OnboardBanner.qml index 25e4b53241..7d973cb74a 100644 --- a/plugins/Marketplace/resources/qml/OnboardBanner.qml +++ b/plugins/Marketplace/resources/qml/OnboardBanner.qml @@ -16,10 +16,7 @@ Rectangle property var onRemove property string readMoreUrl - Layout.preferredHeight: childrenRect.height + 2 * UM.Theme.getSize("default_margin").height - Layout.fillWidth: true - Layout.margins: UM.Theme.getSize("default_margin").width - + implicitHeight: childrenRect.height + 2 * UM.Theme.getSize("default_margin").height color: UM.Theme.getColor("action_panel_secondary") // Icon From ac6375d17bec0f73663e16851b7a6931cffa9531 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 15:47:48 +0100 Subject: [PATCH 34/56] Don't nest all content in background rect This way we don't have an extra identation depth, makes it a bit easier to read CURA-8726 --- .../Marketplace/resources/qml/Marketplace.qml | 303 +++++++++--------- 1 file changed, 151 insertions(+), 152 deletions(-) diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index 796c537640..e02995b1da 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -46,196 +46,195 @@ Window { anchors.fill: parent color: UM.Theme.getColor("main_background") + } + //The Marketplace can have a page in front of everything with package details. The stack view controls its visibility. + StackView + { + id: contextStack + anchors.fill: parent - //The Marketplace can have a page in front of everything with package details. The stack view controls its visibility. - StackView + initialItem: packageBrowse + + ColumnLayout { - id: contextStack - anchors.fill: parent + id: packageBrowse - initialItem: packageBrowse + spacing: UM.Theme.getSize("narrow_margin").height - ColumnLayout + // Page title. + Item { - id: packageBrowse + implicitWidth: parent.width + implicitHeight: childrenRect.height + UM.Theme.getSize("default_margin").height - spacing: UM.Theme.getSize("narrow_margin").height - - // Page title. - Item + Label { - Layout.preferredWidth: parent.width - Layout.preferredHeight: childrenRect.height + UM.Theme.getSize("default_margin").height - - Label + id: pageTitle + anchors { - id: pageTitle - anchors - { - left: parent.left - leftMargin: UM.Theme.getSize("default_margin").width - right: parent.right - rightMargin: UM.Theme.getSize("default_margin").width - bottom: parent.bottom - } - - font: UM.Theme.getFont("large") - color: UM.Theme.getColor("text") - text: content.item ? content.item.pageTitle: catalog.i18nc("@title", "Loading...") + left: parent.left + leftMargin: UM.Theme.getSize("default_margin").width + right: parent.right + rightMargin: UM.Theme.getSize("default_margin").width + bottom: parent.bottom } + + font: UM.Theme.getFont("large") + color: UM.Theme.getColor("text") + text: content.item ? content.item.pageTitle: catalog.i18nc("@title", "Loading...") } + } - OnboardBanner + OnboardBanner + { + visible: content.item && content.item.bannerVisible + text: content.item && content.item.bannerText + icon: content.item && content.item.bannerIcon + onRemove: content.item && content.item.onRemoveBanner + readMoreUrl: content.item && content.item.bannerReadMoreUrl + + Layout.fillWidth: true + Layout.leftMargin: UM.Theme.getSize("default_margin").width + Layout.rightMargin: UM.Theme.getSize("default_margin").width + } + + // Search & Top-Level Tabs + Item + { + Layout.preferredHeight: childrenRect.height + Layout.preferredWidth: parent.width - 2 * UM.Theme.getSize("default_margin").width + Layout.alignment: Qt.AlignHCenter + RowLayout { - visible: content.item && content.item.bannerVisible - text: content.item && content.item.bannerText - icon: content.item && content.item.bannerIcon - onRemove: content.item && content.item.onRemoveBanner - readMoreUrl: content.item && content.item.bannerReadMoreUrl + width: parent.width + height: UM.Theme.getSize("button_icon").height + UM.Theme.getSize("default_margin").height + spacing: UM.Theme.getSize("thin_margin").width - Layout.fillWidth: true - Layout.leftMargin: UM.Theme.getSize("default_margin").width - Layout.rightMargin: UM.Theme.getSize("default_margin").width - } - - // Search & Top-Level Tabs - Item - { - Layout.preferredHeight: childrenRect.height - Layout.preferredWidth: parent.width - 2 * UM.Theme.getSize("default_margin").width - Layout.alignment: Qt.AlignHCenter - RowLayout + Cura.SearchBar { - width: parent.width - height: UM.Theme.getSize("button_icon").height + UM.Theme.getSize("default_margin").height - spacing: UM.Theme.getSize("thin_margin").width + id: searchBar + Layout.preferredHeight: UM.Theme.getSize("button_icon").height + Layout.fillWidth: true + onTextEdited: searchStringChanged(text) + } - Cura.SearchBar + // Page selection. + TabBar + { + id: pageSelectionTabBar + Layout.alignment: Qt.AlignRight + height: UM.Theme.getSize("button_icon").height + spacing: 0 + background: Rectangle { color: "transparent" } + currentIndex: manager.tabShown + + onCurrentIndexChanged: { - id: searchBar - Layout.preferredHeight: UM.Theme.getSize("button_icon").height - Layout.fillWidth: true - onTextEdited: searchStringChanged(text) + manager.tabShown = currentIndex + searchBar.text = ""; + searchBar.visible = currentItem.hasSearch; + content.source = currentItem.sourcePage; } - // Page selection. - TabBar + PackageTypeTab { - id: pageSelectionTabBar - Layout.alignment: Qt.AlignRight - height: UM.Theme.getSize("button_icon").height - spacing: 0 - background: Rectangle { color: "transparent" } - currentIndex: manager.tabShown + id: pluginTabText + width: implicitWidth + text: catalog.i18nc("@button", "Plugins") + property string sourcePage: "Plugins.qml" + property bool hasSearch: true + } + PackageTypeTab + { + id: materialsTabText + width: implicitWidth + text: catalog.i18nc("@button", "Materials") + property string sourcePage: "Materials.qml" + property bool hasSearch: true + } + ManagePackagesButton + { + property string sourcePage: "ManagedPackages.qml" + property bool hasSearch: false - onCurrentIndexChanged: + Cura.NotificationIcon { - manager.tabShown = currentIndex - searchBar.text = ""; - searchBar.visible = currentItem.hasSearch; - content.source = currentItem.sourcePage; - } - - PackageTypeTab - { - id: pluginTabText - width: implicitWidth - text: catalog.i18nc("@button", "Plugins") - property string sourcePage: "Plugins.qml" - property bool hasSearch: true - } - PackageTypeTab - { - id: materialsTabText - width: implicitWidth - text: catalog.i18nc("@button", "Materials") - property string sourcePage: "Materials.qml" - property bool hasSearch: true - } - ManagePackagesButton - { - property string sourcePage: "ManagedPackages.qml" - property bool hasSearch: false - - Cura.NotificationIcon + anchors { - anchors - { - horizontalCenter: parent.right - verticalCenter: parent.top - } - visible: CuraApplication.getPackageManager().packagesWithUpdate.length > 0 + horizontalCenter: parent.right + verticalCenter: parent.top + } + visible: CuraApplication.getPackageManager().packagesWithUpdate.length > 0 - labelText: - { - const itemCount = CuraApplication.getPackageManager().packagesWithUpdate.length - return itemCount > 9 ? "9+" : itemCount - } + labelText: + { + const itemCount = CuraApplication.getPackageManager().packagesWithUpdate.length + return itemCount > 9 ? "9+" : itemCount } } } + } - TextMetrics - { - id: pluginTabTextMetrics - text: pluginTabText.text - font: pluginTabText.font - } - TextMetrics - { - id: materialsTabTextMetrics - text: materialsTabText.text - font: materialsTabText.font - } + TextMetrics + { + id: pluginTabTextMetrics + text: pluginTabText.text + font: pluginTabText.font + } + TextMetrics + { + id: materialsTabTextMetrics + text: materialsTabText.text + font: materialsTabText.font } } + } - FontMetrics - { - id: fontMetrics - font: UM.Theme.getFont("default") - } + FontMetrics + { + id: fontMetrics + font: UM.Theme.getFont("default") + } - Cura.TertiaryButton - { - text: catalog.i18nc("@info", "Search in the browser") - iconSource: UM.Theme.getIcon("LinkExternal") - visible: pageSelectionTabBar.currentItem.hasSearch - isIconOnRightSide: true - height: fontMetrics.height - textFont: fontMetrics.font - textColor: UM.Theme.getColor("text") + Cura.TertiaryButton + { + text: catalog.i18nc("@info", "Search in the browser") + iconSource: UM.Theme.getIcon("LinkExternal") + visible: pageSelectionTabBar.currentItem.hasSearch + isIconOnRightSide: true + height: fontMetrics.height + textFont: fontMetrics.font + textColor: UM.Theme.getColor("text") - onClicked: content.item && Qt.openUrlExternally(content.item.searchInBrowserUrl) - } + onClicked: content.item && Qt.openUrlExternally(content.item.searchInBrowserUrl) + } + + // Page contents. + Rectangle + { + Layout.preferredWidth: parent.width + Layout.fillHeight: true + color: UM.Theme.getColor("detail_background") // Page contents. - Rectangle + Loader { - Layout.preferredWidth: parent.width - Layout.fillHeight: true - color: UM.Theme.getColor("detail_background") + id: content + anchors.fill: parent + anchors.margins: UM.Theme.getSize("default_margin").width + source: "Plugins.qml" - // Page contents. - Loader + Connections { - id: content - anchors.fill: parent - anchors.margins: UM.Theme.getSize("default_margin").width - source: "Plugins.qml" - - Connections + target: content + function onLoaded() { - target: content - function onLoaded() - { - pageTitle.text = content.item.pageTitle - searchStringChanged.connect(handleSearchStringChanged) - } - function handleSearchStringChanged(new_search) - { - content.item.model.searchString = new_search - } + pageTitle.text = content.item.pageTitle + searchStringChanged.connect(handleSearchStringChanged) + } + function handleSearchStringChanged(new_search) + { + content.item.model.searchString = new_search } } } From a36fedabe5a7aa3a6abec462905f16ee6c51a678 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 15:53:07 +0100 Subject: [PATCH 35/56] Remove unused fontMetrics objects CURA-8762 --- .../Marketplace/resources/qml/Marketplace.qml | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index e02995b1da..5a30141b32 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -101,8 +101,8 @@ Window // Search & Top-Level Tabs Item { - Layout.preferredHeight: childrenRect.height - Layout.preferredWidth: parent.width - 2 * UM.Theme.getSize("default_margin").width + implicitHeight: childrenRect.height + implicitWidth: parent.width - 2 * UM.Theme.getSize("default_margin").width Layout.alignment: Qt.AlignHCenter RowLayout { @@ -113,7 +113,7 @@ Window Cura.SearchBar { id: searchBar - Layout.preferredHeight: UM.Theme.getSize("button_icon").height + implicitHeight: UM.Theme.getSize("button_icon").height Layout.fillWidth: true onTextEdited: searchStringChanged(text) } @@ -174,19 +174,6 @@ Window } } } - - TextMetrics - { - id: pluginTabTextMetrics - text: pluginTabText.text - font: pluginTabText.font - } - TextMetrics - { - id: materialsTabTextMetrics - text: materialsTabText.text - font: materialsTabText.font - } } } From 0d85b2be7f1df479b2619000732febcb0f3db0b7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 16:07:11 +0100 Subject: [PATCH 36/56] Ensure that scrollbar is centered CURA-8762 --- plugins/Marketplace/resources/qml/Packages.qml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/plugins/Marketplace/resources/qml/Packages.qml b/plugins/Marketplace/resources/qml/Packages.qml index 194c90c248..17fa884ad7 100644 --- a/plugins/Marketplace/resources/qml/Packages.qml +++ b/plugins/Marketplace/resources/qml/Packages.qml @@ -53,8 +53,8 @@ ListView // Vertical ScrollBar, styled similarly to the scrollBar in the settings panel id: verticalScrollBar visible: packages.contentHeight > packages.height - - background: Item{} + anchors.right: parent.right + background: Item {} contentItem: Rectangle { @@ -83,7 +83,16 @@ ListView { manageableInListView: packages.packagesManageableInListView packageData: model.package - width: parent.width - UM.Theme.getSize("default_margin").width - UM.Theme.getSize("narrow_margin").width + width: { + if(verticalScrollBar.visible) + { + return parent.width - UM.Theme.getSize("default_margin").width - UM.Theme.getSize("default_margin").width + } + else + { + return parent.width - UM.Theme.getSize("default_margin").width + } + } color: cardMouseArea.containsMouse ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("main_background") } } From 7926a2bbdcc781f857029c56612890fb2cd8beda Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 16:33:52 +0100 Subject: [PATCH 37/56] Add placeholders for material & plugin icons CURA-8762 --- .../Marketplace/resources/images/Plugin.svg | 3 +++ .../Marketplace/resources/images/Spool.svg | 3 +++ .../resources/qml/PackageCardHeader.qml | 20 +++++++++++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 plugins/Marketplace/resources/images/Plugin.svg create mode 100644 plugins/Marketplace/resources/images/Spool.svg diff --git a/plugins/Marketplace/resources/images/Plugin.svg b/plugins/Marketplace/resources/images/Plugin.svg new file mode 100644 index 0000000000..51356d842c --- /dev/null +++ b/plugins/Marketplace/resources/images/Plugin.svg @@ -0,0 +1,3 @@ + + + diff --git a/plugins/Marketplace/resources/images/Spool.svg b/plugins/Marketplace/resources/images/Spool.svg new file mode 100644 index 0000000000..dae9b43030 --- /dev/null +++ b/plugins/Marketplace/resources/images/Spool.svg @@ -0,0 +1,3 @@ + + + diff --git a/plugins/Marketplace/resources/qml/PackageCardHeader.qml b/plugins/Marketplace/resources/qml/PackageCardHeader.qml index d6289f8ce1..ed5cce8485 100644 --- a/plugins/Marketplace/resources/qml/PackageCardHeader.qml +++ b/plugins/Marketplace/resources/qml/PackageCardHeader.qml @@ -32,8 +32,24 @@ Item } width: UM.Theme.getSize("card_icon").width height: width - - source: packageData.iconUrl != "" ? packageData.iconUrl : "../images/placeholder.svg" + sourceSize.height: height + sourceSize.width: width + source: + { + if(packageData.iconUrl != "") + { + return packageData.iconUrl + } + if(packageData.packageType == "plugin") + { + return "../images/Plugin.svg" + } + if(packageData.packageType == "material") + { + return "../images/Spool.svg" + } + return "../images/placeholder.svg" + } } ColumnLayout From d29b00b4be188fdb366a5bc4b8581e613313e8e4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Feb 2022 16:38:47 +0100 Subject: [PATCH 38/56] Let readmore point towards marketplace URL CURA-8762 --- plugins/Marketplace/PackageModel.py | 5 +++++ plugins/Marketplace/resources/qml/PackageCard.qml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/Marketplace/PackageModel.py b/plugins/Marketplace/PackageModel.py index 7c2a5d9ae1..29c8abe653 100644 --- a/plugins/Marketplace/PackageModel.py +++ b/plugins/Marketplace/PackageModel.py @@ -39,6 +39,7 @@ class PackageModel(QObject): self._package_type = package_data.get("package_type", "") self._is_bundled = package_data.get("is_bundled", False) self._icon_url = package_data.get("icon_url", "") + self._marketplace_url = package_data.get("marketplace_url", "") self._display_name = package_data.get("display_name", catalog.i18nc("@label:property", "Unknown Package")) tags = package_data.get("tags", []) self._is_checked_by_ultimaker = (self._package_type == "plugin" and "verified" in tags) or ( @@ -210,6 +211,10 @@ class PackageModel(QObject): def packageId(self) -> str: return self._package_id + @pyqtProperty(str, constant=True) + def marketplaceURL(self)-> str: + return self._marketplace_url + @pyqtProperty(str, constant = True) def packageType(self) -> str: return self._package_type diff --git a/plugins/Marketplace/resources/qml/PackageCard.qml b/plugins/Marketplace/resources/qml/PackageCard.qml index 633d2b25b9..db1a0874e1 100644 --- a/plugins/Marketplace/resources/qml/PackageCard.qml +++ b/plugins/Marketplace/resources/qml/PackageCard.qml @@ -88,7 +88,7 @@ Rectangle textFont: descriptionLabel.font isIconOnRightSide: true - onClicked: Qt.openUrlExternally(packageData.packageInfoUrl) + onClicked: Qt.openUrlExternally(packageData.marketplaceURL) } } } From 3b801e9f180158571ff335c7a1425ef1ccdfb7af Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 23 Feb 2022 09:57:04 +0100 Subject: [PATCH 39/56] Change top external button to point to marketplace website CURA-8762 --- plugins/Marketplace/resources/qml/PackageCardHeader.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Marketplace/resources/qml/PackageCardHeader.qml b/plugins/Marketplace/resources/qml/PackageCardHeader.qml index ed5cce8485..ca4165b97a 100644 --- a/plugins/Marketplace/resources/qml/PackageCardHeader.qml +++ b/plugins/Marketplace/resources/qml/PackageCardHeader.qml @@ -119,7 +119,7 @@ Item color: externalLinkButton.hovered ? UM.Theme.getColor("action_button_hovered"): "transparent" radius: externalLinkButton.width / 2 } - onClicked: Qt.openUrlExternally(packageData.authorInfoUrl) + onClicked: Qt.openUrlExternally(packageData.marketplaceURL) } } From 35f1ad4097b97501c9736e2135490e59d5cbcc86 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 23 Feb 2022 09:59:12 +0100 Subject: [PATCH 40/56] Remove read more button on packagecard CURA-8762 --- .../Marketplace/resources/qml/PackageCard.qml | 48 ------------------- 1 file changed, 48 deletions(-) diff --git a/plugins/Marketplace/resources/qml/PackageCard.qml b/plugins/Marketplace/resources/qml/PackageCard.qml index db1a0874e1..1b4c4c354e 100644 --- a/plugins/Marketplace/resources/qml/PackageCard.qml +++ b/plugins/Marketplace/resources/qml/PackageCard.qml @@ -41,54 +41,6 @@ Rectangle wrapMode: Text.Wrap elide: Text.ElideRight visible: text !== "" - - onLineLaidOut: - { - if(truncated && line.isLast) - { - let max_line_width = parent.width - readMoreButton.width - fontMetrics.advanceWidth("… ") - 2 * UM.Theme.getSize("default_margin").width; - if(line.implicitWidth > max_line_width) - { - line.width = max_line_width; - } - else - { - line.width = line.implicitWidth - fontMetrics.advanceWidth("…"); //Truncate the ellipsis. We're adding this ourselves. - } - descriptionLabel.lastLineWidth = line.implicitWidth; - } - } - } - Label - { - id: tripleDotLabel - anchors.left: parent.left - anchors.leftMargin: descriptionLabel.lastLineWidth - anchors.bottom: descriptionLabel.bottom - - text: "… " - font: descriptionLabel.font - color: descriptionLabel.color - visible: descriptionLabel.truncated && descriptionLabel.text !== "" - } - Cura.TertiaryButton - { - id: readMoreButton - anchors.right: parent.right - anchors.bottom: descriptionLabel.bottom - height: fontMetrics.height //Height of a single line. - - text: catalog.i18nc("@info", "Read more") - iconSource: UM.Theme.getIcon("LinkExternal") - - visible: descriptionLabel.truncated && descriptionLabel.text !== "" - enabled: visible - leftPadding: UM.Theme.getSize("default_margin").width - rightPadding: UM.Theme.getSize("wide_margin").width - textFont: descriptionLabel.font - isIconOnRightSide: true - - onClicked: Qt.openUrlExternally(packageData.marketplaceURL) } } } From df9d2d85c43dc4d25a7bfafa0bf4b36c5cfff602 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 23 Feb 2022 10:12:21 +0100 Subject: [PATCH 41/56] Add help links to banners CURA-8762 --- plugins/Marketplace/resources/qml/ManagedPackages.qml | 2 +- plugins/Marketplace/resources/qml/Materials.qml | 2 +- plugins/Marketplace/resources/qml/Plugins.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Marketplace/resources/qml/ManagedPackages.qml b/plugins/Marketplace/resources/qml/ManagedPackages.qml index 8ccaacea46..3eb77d8485 100644 --- a/plugins/Marketplace/resources/qml/ManagedPackages.qml +++ b/plugins/Marketplace/resources/qml/ManagedPackages.qml @@ -13,7 +13,7 @@ Packages bannerVisible: UM.Preferences.getValue("cura/market_place_show_manage_packages_banner"); bannerIcon: UM.Theme.getIcon("ArrowDoubleCircleRight") bannerText: catalog.i18nc("@text", "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly.") - bannerReadMoreUrl: "" // TODO add when support page is ready + bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/4411125921426/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-manage" onRemoveBanner: function() { UM.Preferences.setValue("cura/market_place_show_manage_packages_banner", false); bannerVisible = false; diff --git a/plugins/Marketplace/resources/qml/Materials.qml b/plugins/Marketplace/resources/qml/Materials.qml index 39fae7042a..ddac8b0bbe 100644 --- a/plugins/Marketplace/resources/qml/Materials.qml +++ b/plugins/Marketplace/resources/qml/Materials.qml @@ -10,7 +10,7 @@ Packages bannerVisible: UM.Preferences.getValue("cura/market_place_show_material_banner") bannerIcon: UM.Theme.getIcon("Spool") bannerText: catalog.i18nc("@text", "Select and install material profiles optimised for your Ultimaker 3D printers.") - bannerReadMoreUrl: "" // TODO add when support page is ready + bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/360011968360/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-materials" onRemoveBanner: function() { UM.Preferences.setValue("cura/market_place_show_material_banner", false); bannerVisible = false; diff --git a/plugins/Marketplace/resources/qml/Plugins.qml b/plugins/Marketplace/resources/qml/Plugins.qml index 9983a827d8..f1a524c029 100644 --- a/plugins/Marketplace/resources/qml/Plugins.qml +++ b/plugins/Marketplace/resources/qml/Plugins.qml @@ -10,7 +10,7 @@ Packages bannerVisible: UM.Preferences.getValue("cura/market_place_show_plugin_banner") bannerIcon: UM.Theme.getIcon("Shop") bannerText: catalog.i18nc("@text", "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users.") - bannerReadMoreUrl: "" // TODO add when support page is ready + bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/360011968360/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-plugins" onRemoveBanner: function() { UM.Preferences.setValue("cura/market_place_show_plugin_banner", false) bannerVisible = false; From 095b8dc5dd00e1fc8300e9f530b6a44018ee7277 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 23 Feb 2022 16:51:26 +0100 Subject: [PATCH 42/56] Show install, uninstall & disable buttons in packages list This splits up the single show controls property into three seperate ones and no longer hides installed packages from the plugin & materials list CURA-8834 --- plugins/Marketplace/RemotePackageList.py | 3 --- .../Marketplace/resources/qml/ManagedPackages.qml | 5 +++-- plugins/Marketplace/resources/qml/Materials.qml | 3 ++- plugins/Marketplace/resources/qml/PackageCard.qml | 4 +++- .../Marketplace/resources/qml/PackageCardHeader.qml | 13 ++++++++----- plugins/Marketplace/resources/qml/PackagePage.qml | 4 +++- plugins/Marketplace/resources/qml/Packages.qml | 9 +++++++-- plugins/Marketplace/resources/qml/Plugins.qml | 3 ++- 8 files changed, 28 insertions(+), 16 deletions(-) diff --git a/plugins/Marketplace/RemotePackageList.py b/plugins/Marketplace/RemotePackageList.py index 16b0e721ad..4c82f2b29a 100644 --- a/plugins/Marketplace/RemotePackageList.py +++ b/plugins/Marketplace/RemotePackageList.py @@ -117,9 +117,6 @@ class RemotePackageList(PackageList): return for package_data in response_data["data"]: - package_id = package_data["package_id"] - if package_id in self._package_manager.local_packages_ids: - continue # We should only show packages which are not already installed try: package = PackageModel(package_data, parent = self) self._connectManageButtonSignals(package) diff --git a/plugins/Marketplace/resources/qml/ManagedPackages.qml b/plugins/Marketplace/resources/qml/ManagedPackages.qml index 8ccaacea46..53b424ad23 100644 --- a/plugins/Marketplace/resources/qml/ManagedPackages.qml +++ b/plugins/Marketplace/resources/qml/ManagedPackages.qml @@ -19,7 +19,8 @@ Packages bannerVisible = false; } searchInBrowserUrl: "https://marketplace.ultimaker.com/app/cura/plugins?utm_source=cura&utm_medium=software&utm_campaign=marketplace-search-plugins-browser" - packagesManageableInListView: true - + showUpdateButton: true + showInstallButton: true + showDisableButton: true model: manager.LocalPackageList } diff --git a/plugins/Marketplace/resources/qml/Materials.qml b/plugins/Marketplace/resources/qml/Materials.qml index 39fae7042a..546b2072e6 100644 --- a/plugins/Marketplace/resources/qml/Materials.qml +++ b/plugins/Marketplace/resources/qml/Materials.qml @@ -16,7 +16,8 @@ Packages bannerVisible = false; } searchInBrowserUrl: "https://marketplace.ultimaker.com/app/cura/materials?utm_source=cura&utm_medium=software&utm_campaign=marketplace-search-materials-browser" - packagesManageableInListView: false + showUpdateButton: true + showInstallButton: true model: manager.MaterialPackageList } diff --git a/plugins/Marketplace/resources/qml/PackageCard.qml b/plugins/Marketplace/resources/qml/PackageCard.qml index 633d2b25b9..58bb952a53 100644 --- a/plugins/Marketplace/resources/qml/PackageCard.qml +++ b/plugins/Marketplace/resources/qml/PackageCard.qml @@ -11,7 +11,9 @@ import Cura 1.6 as Cura Rectangle { property alias packageData: packageCardHeader.packageData - property alias manageableInListView: packageCardHeader.showManageButtons + property alias showUpdateButton: packageCardHeader.showUpdateButton + property alias showDisableButton: packageCardHeader.showDisableButton + property alias showInstallButton: packageCardHeader.showInstallButton height: childrenRect.height color: UM.Theme.getColor("main_background") diff --git a/plugins/Marketplace/resources/qml/PackageCardHeader.qml b/plugins/Marketplace/resources/qml/PackageCardHeader.qml index 3a76f7a959..7ae55249d3 100644 --- a/plugins/Marketplace/resources/qml/PackageCardHeader.qml +++ b/plugins/Marketplace/resources/qml/PackageCardHeader.qml @@ -12,10 +12,13 @@ import Cura 1.6 as Cura // are combined into the reusable "PackageCardHeader" component Item { - default property alias contents: contentItem.children; + default property alias contents: contentItem.children property var packageData - property bool showManageButtons: false + property bool showDisableButton: false + property bool showInstallButton: false + property bool showUpdateButton: false + width: parent.width height: UM.Theme.getSize("card").height @@ -157,7 +160,7 @@ Item ManageButton { id: enableManageButton - visible: showManageButtons && packageData.isInstalled && !packageData.isToBeInstalled && packageData.packageType != "material" + visible: showDisableButton && packageData.isInstalled && !packageData.isToBeInstalled && packageData.packageType != "material" enabled: !packageData.busy button_style: !packageData.isActive @@ -171,7 +174,7 @@ Item ManageButton { id: installManageButton - visible: showManageButtons && (packageData.canDowngrade || !packageData.isBundled) + visible: showInstallButton && (packageData.canDowngrade || !packageData.isBundled) enabled: !packageData.busy busy: packageData.busy button_style: !(packageData.isInstalled || packageData.isToBeInstalled) @@ -201,7 +204,7 @@ Item ManageButton { id: updateManageButton - visible: showManageButtons && packageData.canUpdate + visible: showUpdateButton && packageData.canUpdate enabled: !packageData.busy busy: packageData.busy Layout.alignment: Qt.AlignTop diff --git a/plugins/Marketplace/resources/qml/PackagePage.qml b/plugins/Marketplace/resources/qml/PackagePage.qml index 21c400fff2..7db380bb4b 100644 --- a/plugins/Marketplace/resources/qml/PackagePage.qml +++ b/plugins/Marketplace/resources/qml/PackagePage.qml @@ -31,7 +31,9 @@ Rectangle PackageCardHeader { id: packageCardHeader - showManageButtons: true + showUpdateButton: true + showInstallButton: true + showDisableButton: true anchors.fill: parent diff --git a/plugins/Marketplace/resources/qml/Packages.qml b/plugins/Marketplace/resources/qml/Packages.qml index 194c90c248..ed48e6cd71 100644 --- a/plugins/Marketplace/resources/qml/Packages.qml +++ b/plugins/Marketplace/resources/qml/Packages.qml @@ -19,7 +19,10 @@ ListView property string bannerText property string bannerReadMoreUrl property var onRemoveBanner - property bool packagesManageableInListView + + property bool showUpdateButton + property bool showDisableButton + property bool showInstallButton clip: true @@ -81,7 +84,9 @@ ListView PackageCard { - manageableInListView: packages.packagesManageableInListView + showUpdateButton: packages.showUpdateButton + showDisableButton: packages.showDisableButton + showInstallButton: packages.showInstallButton packageData: model.package width: parent.width - UM.Theme.getSize("default_margin").width - UM.Theme.getSize("narrow_margin").width color: cardMouseArea.containsMouse ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("main_background") diff --git a/plugins/Marketplace/resources/qml/Plugins.qml b/plugins/Marketplace/resources/qml/Plugins.qml index 9983a827d8..37e3679e6b 100644 --- a/plugins/Marketplace/resources/qml/Plugins.qml +++ b/plugins/Marketplace/resources/qml/Plugins.qml @@ -16,7 +16,8 @@ Packages bannerVisible = false; } searchInBrowserUrl: "https://marketplace.ultimaker.com/app/cura/plugins?utm_source=cura&utm_medium=software&utm_campaign=marketplace-search-plugins-browser" - packagesManageableInListView: false + showUpdateButton: true + showInstallButton: true model: manager.PluginPackageList } From 41e04f2e9df59bb1f7b7faf9c8977c9750f44b92 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Thu, 24 Feb 2022 11:34:48 +0100 Subject: [PATCH 43/56] Progress bar causing crash due to incorrect min max value variable names. Give buttons fixed leftMargin in monitor page so icons are center aligned. CURA-8980 --- resources/qml/MonitorButton.qml | 4 ++-- resources/qml/PrinterOutput/ManualPrinterControl.qml | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml index 6a64003185..4876b01fb3 100644 --- a/resources/qml/MonitorButton.qml +++ b/resources/qml/MonitorButton.qml @@ -183,8 +183,8 @@ Item UM.ProgressBar { id: progressBar - minimumValue: 0 - maximumValue: 100 + from: 0 + to: 100 value: 0 //Doing this in an explicit binding since the implicit binding breaks on occasion. diff --git a/resources/qml/PrinterOutput/ManualPrinterControl.qml b/resources/qml/PrinterOutput/ManualPrinterControl.qml index 9024d177a0..d179ba6be4 100644 --- a/resources/qml/PrinterOutput/ManualPrinterControl.qml +++ b/resources/qml/PrinterOutput/ManualPrinterControl.qml @@ -98,6 +98,7 @@ Item Layout.preferredWidth: _buttonSize Layout.preferredHeight: _buttonSize iconSource: UM.Theme.getIcon("ChevronSingleUp") + leftPadding: (Layout.preferredWidth - iconSize) / 2 onClicked: printerModel.moveHead(0, distancesRow.currentDistance, 0) } @@ -109,6 +110,7 @@ Item Layout.preferredWidth: _buttonSize Layout.preferredHeight: _buttonSize iconSource: UM.Theme.getIcon("ChevronSingleLeft") + leftPadding: (Layout.preferredWidth - iconSize) / 2 onClicked: printerModel.moveHead(-distancesRow.currentDistance, 0, 0) } @@ -120,6 +122,7 @@ Item Layout.preferredWidth: _buttonSize Layout.preferredHeight: _buttonSize iconSource: UM.Theme.getIcon("ChevronSingleRight") + leftPadding: (Layout.preferredWidth - iconSize) / 2 onClicked: printerModel.moveHead(distancesRow.currentDistance, 0, 0) } @@ -131,6 +134,7 @@ Item Layout.preferredWidth: _buttonSize Layout.preferredHeight: _buttonSize iconSource: UM.Theme.getIcon("ChevronSingleDown") + leftPadding: (Layout.preferredWidth - iconSize) / 2 onClicked: printerModel.moveHead(0, -distancesRow.currentDistance, 0) } @@ -142,6 +146,7 @@ Item Layout.preferredWidth: _buttonSize Layout.preferredHeight: _buttonSize iconSource: UM.Theme.getIcon("House") + leftPadding: (Layout.preferredWidth - iconSize) / 2 onClicked: printerModel.homeHead() } @@ -166,6 +171,7 @@ Item iconSource: UM.Theme.getIcon("ChevronSingleUp") width: height height: _buttonSize + leftPadding: (width - iconSize) / 2 onClicked: printerModel.moveHead(0, 0, distancesRow.currentDistance) @@ -176,6 +182,7 @@ Item iconSource: UM.Theme.getIcon("House") width: height height: _buttonSize + leftPadding: (width - iconSize) / 2 onClicked: printerModel.homeBed() } @@ -185,6 +192,7 @@ Item iconSource: UM.Theme.getIcon("ChevronSingleDown") width: height height: _buttonSize + leftPadding: (width - iconSize) / 2 onClicked: printerModel.moveHead(0, 0, -distancesRow.currentDistance) } From 19e43e8b663b3c40afe7a1e314e32bf410ae8a09 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 24 Feb 2022 13:26:28 +0100 Subject: [PATCH 44/56] Apply suggestions from code review CURA-8762 Co-authored-by: Casper Lamboo --- .../Marketplace/resources/qml/PackageCardHeader.qml | 13 +++++-------- plugins/Marketplace/resources/qml/Packages.qml | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/plugins/Marketplace/resources/qml/PackageCardHeader.qml b/plugins/Marketplace/resources/qml/PackageCardHeader.qml index ca4165b97a..9e3e673ea2 100644 --- a/plugins/Marketplace/resources/qml/PackageCardHeader.qml +++ b/plugins/Marketplace/resources/qml/PackageCardHeader.qml @@ -36,19 +36,16 @@ Item sourceSize.width: width source: { - if(packageData.iconUrl != "") + if (packageData.iconUrl != "") { return packageData.iconUrl } - if(packageData.packageType == "plugin") + switch (packageData.packageType) { - return "../images/Plugin.svg" + case "plugin": return "../images/Plugin.svg"; + case "material": return "../images/Spool.svg"; + default: return "../images/placeholder.svg"; } - if(packageData.packageType == "material") - { - return "../images/Spool.svg" - } - return "../images/placeholder.svg" } } diff --git a/plugins/Marketplace/resources/qml/Packages.qml b/plugins/Marketplace/resources/qml/Packages.qml index 17fa884ad7..5cd52e5628 100644 --- a/plugins/Marketplace/resources/qml/Packages.qml +++ b/plugins/Marketplace/resources/qml/Packages.qml @@ -84,7 +84,7 @@ ListView manageableInListView: packages.packagesManageableInListView packageData: model.package width: { - if(verticalScrollBar.visible) + if (verticalScrollBar.visible) { return parent.width - UM.Theme.getSize("default_margin").width - UM.Theme.getSize("default_margin").width } From 0d2c8777c548fdc7f63d61b61e2f5799f03af421 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 24 Feb 2022 13:28:39 +0100 Subject: [PATCH 45/56] Add clarifying comment to a small hack CURA-8762 --- plugins/Marketplace/resources/qml/PackagePage.qml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/Marketplace/resources/qml/PackagePage.qml b/plugins/Marketplace/resources/qml/PackagePage.qml index 00e022dc20..4384d2843f 100644 --- a/plugins/Marketplace/resources/qml/PackagePage.qml +++ b/plugins/Marketplace/resources/qml/PackagePage.qml @@ -40,6 +40,9 @@ Rectangle id: downloadCount Layout.preferredWidth: parent.width Layout.fillHeight: true + // It's not the perfect way to handle this, since a package really can have 0 downloads + // But we re-use the package page for the manage plugins as well. The one user that doesn't see + // the num downloads is an acceptable "sacrifice" to make this easy to fix. visible: packageData.downloadCount != "0" UM.RecolorImage { From 26c027cbdf5930174c06136b117258e39983baf7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 24 Feb 2022 13:30:25 +0100 Subject: [PATCH 46/56] Remove unneeded properties from package card As per review. CURA-8762 --- plugins/Marketplace/resources/qml/PackageCard.qml | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/Marketplace/resources/qml/PackageCard.qml b/plugins/Marketplace/resources/qml/PackageCard.qml index 1b4c4c354e..9a5f9beab6 100644 --- a/plugins/Marketplace/resources/qml/PackageCard.qml +++ b/plugins/Marketplace/resources/qml/PackageCard.qml @@ -31,10 +31,8 @@ Rectangle { id: descriptionLabel width: parent.width - property real lastLineWidth: 0; //Store the width of the last line, to properly position the elision. text: packageData.description - textFormat: Text.PlainText //Must be plain text, or we won't get onLineLaidOut signals. Don't auto-detect! font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") maximumLineCount: 2 From 61beb963c2fb23becaa4057eb508b5174cf207ad Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Thu, 24 Feb 2022 14:58:07 +0100 Subject: [PATCH 47/56] Swap flat buttons for Cura Styled buttons. These "buttons" function like radiobuttons so a bit of extra styling needed to be added to swap appearance. Removed fixed width as it breaks centering with Cura buttons CURA-8980 --- resources/qml/PrinterOutput/ManualPrinterControl.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/qml/PrinterOutput/ManualPrinterControl.qml b/resources/qml/PrinterOutput/ManualPrinterControl.qml index d179ba6be4..bf987b282f 100644 --- a/resources/qml/PrinterOutput/ManualPrinterControl.qml +++ b/resources/qml/PrinterOutput/ManualPrinterControl.qml @@ -226,15 +226,15 @@ Item Repeater { model: distancesModel - delegate: Button + delegate: Cura.SecondaryButton { height: UM.Theme.getSize("setting_control").height - width: height + UM.Theme.getSize("default_margin").width text: model.label ButtonGroup.group: distanceGroup - checkable: true - checked: distancesRow.currentDistance == model.value + color: distancesRow.currentDistance == model.value ? UM.Theme.getColor("primary_button") : UM.Theme.getColor("secondary_button") + textColor: distancesRow.currentDistance == model.value ? UM.Theme.getColor("primary_button_text"): UM.Theme.getColor("secondary_button_text") + hoverColor: distancesRow.currentDistance == model.value ? UM.Theme.getColor("primary_button_hover"): UM.Theme.getColor("secondary_button_hover") onClicked: distancesRow.currentDistance = model.value } } From 2327a71642d5aa357438460c2ab7ca10b7a9472e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Feb 2022 13:16:59 +0100 Subject: [PATCH 48/56] Remove monitor margin No idea why it was even there as it's own size. --- .../resources/qml/MonitorPrintJobProgressBar.qml | 4 ++-- resources/themes/cura-light/theme.json | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml index 93c34cf603..b2d6c7c610 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml @@ -38,7 +38,7 @@ Item anchors { left: progressBar.right - leftMargin: UM.Theme.getSize("monitor_margin").width + leftMargin: UM.Theme.getSize("default_margin").width verticalCenter: parent.verticalCenter } text: printJob ? Math.round(printJob.progress * 100) + "%" : "0%" @@ -54,7 +54,7 @@ Item anchors { left: percentLabel.right - leftMargin: UM.Theme.getSize("monitor_margin").width + leftMargin: UM.Theme.getSize("default_margin").width verticalCenter: parent.verticalCenter } wrapMode: Text.NoWrap diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 0ea2a31774..22a624301a 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -669,7 +669,6 @@ "monitor_external_link_icon": [1.16, 1.16], "monitor_column": [18.0, 1.0], "monitor_progress_bar": [16.5, 1.0], - "monitor_margin": [1.5, 1.5], "table_row": [2.0, 2.0], From 9d202b9e61203e60baa5c94eb4eeac146c4f89ab Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Feb 2022 13:18:45 +0100 Subject: [PATCH 49/56] Remove unused monitor items from theme --- resources/themes/cura-light/theme.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 22a624301a..f21afc4210 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -656,14 +656,9 @@ "avatar_image": [6.8, 6.8], - "monitor_config_override_box": [1.0, 14.0], - "monitor_extruder_circle": [2.75, 2.75], "monitor_text_line": [1.5, 1.5], "monitor_text_line_large": [2.33, 2.33], - "monitor_thick_lining": [0.16, 0.16], - "monitor_corner_radius": [0.3, 0.3], "monitor_shadow_radius": [0.4, 0.4], - "monitor_shadow_offset": [0.15, 0.15], "monitor_empty_state_offset": [5.6, 5.6], "monitor_empty_state_size": [35.0, 25.0], "monitor_external_link_icon": [1.16, 1.16], From b3d3f5546c35db3e5aeede94b925201ec3938e28 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Feb 2022 13:19:59 +0100 Subject: [PATCH 50/56] Remove objectlist items from theme THey weren't used anyway, so time to clean up! --- resources/themes/cura-light/theme.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index f21afc4210..45c7b69c68 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -643,14 +643,9 @@ "message_type_icon": [2, 2], "menu": [18, 2], - "infill_button_margin": [0.5, 0.5], - "jobspecs_line": [2.0, 2.0], "objects_menu_size": [15, 15], - "objects_menu_size_collapsed": [20, 17], - "build_plate_selection_size": [15, 5], - "objects_menu_button": [0.3, 2.7], "notification_icon": [1.5, 1.5], From 5f638ed6c630c322114aaac2a537cbe8c301b8b9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Feb 2022 13:22:55 +0100 Subject: [PATCH 51/56] Generalize the size of the licence window No need to have a seperate size of the licence window. Just use the default modal one --- plugins/Marketplace/resources/qml/LicenseDialog.qml | 4 ++-- resources/themes/cura-light/theme.json | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/Marketplace/resources/qml/LicenseDialog.qml b/plugins/Marketplace/resources/qml/LicenseDialog.qml index 1c99569793..09d7c5b59a 100644 --- a/plugins/Marketplace/resources/qml/LicenseDialog.qml +++ b/plugins/Marketplace/resources/qml/LicenseDialog.qml @@ -14,8 +14,8 @@ UM.Dialog { id: licenseDialog title: catalog.i18nc("@button", "Plugin license agreement") - minimumWidth: UM.Theme.getSize("license_window_minimum").width - minimumHeight: UM.Theme.getSize("license_window_minimum").height + minimumWidth: UM.Theme.getSize("modal_window_minimum").width + minimumHeight: UM.Theme.getSize("modal_window_minimum").height width: minimumWidth height: minimumHeight backgroundColor: UM.Theme.getColor("main_background") diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 45c7b69c68..15763e0711 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -632,7 +632,6 @@ "welcome_wizard_window": [46, 50], "modal_window_minimum": [60.0, 45], - "license_window_minimum": [45, 45], "wizard_progress": [10.0, 0.0], "message": [30.0, 5.0], From ff0b64a56a870045a0592f9a64f7916865c34cf0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Feb 2022 13:33:32 +0100 Subject: [PATCH 52/56] Purge bunch of unused sizes from theme --- resources/themes/cura-dark/theme.json | 3 --- resources/themes/cura-light/theme.json | 24 ------------------------ 2 files changed, 27 deletions(-) diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 2956e3f809..56638cc3ef 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -152,7 +152,6 @@ "checkbox_border": [255, 255, 255, 38], "checkbox_border_hover": [255, 255, 255, 38], "checkbox_mark": [255, 255, 255, 181], - "checkbox_square": [118, 118, 118, 255], "checkbox_text": [255, 255, 255, 181], "tooltip": [39, 44, 48, 255], @@ -160,8 +159,6 @@ "tool_panel_background": [39, 44, 48, 255], - "tool_button_border": [255, 255, 255, 38], - "viewport_background": [31, 36, 39, 255], "volume_outline": [12, 169, 227, 128], "buildplate": [169, 169, 169, 255], diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 15763e0711..e35b7c923f 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -277,8 +277,6 @@ "extruder_button_material_border": [255, 255, 255, 255], "extruder_disabled": [255, 255, 255, 102], - "rating_star": [90, 90, 90, 255], - "sync_button_text": [120, 120, 120, 255], "sync_button_text_hovered": [0, 0, 0, 255], @@ -356,7 +354,6 @@ "checkbox_border": [180, 180, 180, 255], "checkbox_border_hover": [25, 110, 240, 255], "checkbox_mark": [35, 35, 35, 255], - "checkbox_square": [180, 180, 180, 255], "checkbox_disabled": [223, 223, 223, 255], "checkbox_text": [0, 12, 26, 255], @@ -481,20 +478,16 @@ "sizes": { "window_minimum_size": [80, 48], - "large_popup_dialog": [48, 40], "popup_dialog": [40, 36], "small_popup_dialog": [36, 12], "main_window_header": [0.0, 4.0], - "main_window_header_button": [8, 2.35], - "main_window_header_button_icon": [1.2, 1.2], "stage_menu": [0.0, 4.0], "account_button": [12, 2.5], "print_setup_widget": [38.0, 30.0], - "print_setup_mode_toggle": [0.0, 2.0], "print_setup_extruder_box": [0.0, 6.0], "print_setup_slider_groove": [0.16, 0.16], "print_setup_slider_handle": [1.0, 1.0], @@ -509,7 +502,6 @@ "expandable_component_content_header": [0.0, 3.0], "configuration_selector": [35.0, 4.0], - "configuration_selector_mode_tabs": [1.0, 3.0], "action_panel_widget": [26.0, 0.0], "action_panel_information_widget": [20.0, 0.0], @@ -543,17 +535,12 @@ "section_control": [0, 1], "section_icon": [2, 2], "section_icon_column": [2.5, 2.5], - "rating_star": [1.0, 1.0], - "card": [25.0, 6.0], "setting": [25.0, 1.8], "setting_control": [11.0, 2.0], "setting_control_radius": [0.15, 0.15], "setting_control_depth_margin": [1.4, 0.0], - "setting_preferences_button_margin": [4, 0.0], - "setting_control_margin": [0.0, 0.0], "setting_unit_margin": [0.5, 0.5], - "setting_text_maxwidth": [40.0, 0.0], "standard_list_lineheight": [1.5, 1.5], "standard_arrow": [1.0, 1.0], @@ -564,13 +551,11 @@ "button": [4, 4], "button_icon": [2.5, 2.5], - "button_lining": [0, 0], "action_button": [15.0, 2.5], "action_button_icon": [1.5, 1.5], "action_button_icon_small": [1.0, 1.0], "action_button_radius": [0.15, 0.15], - "dialog_primary_button_padding": [3.0, 0], "radio_button": [1.3, 1.3], @@ -584,20 +569,15 @@ "favorites_button": [2, 2], "favorites_button_icon": [1.2, 1.2], - "icon_indicator_background": [1.5, 1.5], "icon_indicator": [1, 1], "printer_status_icon": [1.0, 1.0], - "printer_sync_icon": [1.2, 1.2], "button_tooltip": [1.0, 1.3], "button_tooltip_arrow": [0.25, 0.25], - "tool_button_border": [1.0, 0], - "progressbar": [26.0, 0.75], "progressbar_radius": [0.15, 0.15], - "progressbar_control": [8.0, 0.75], "scrollbar": [0.75, 0.5], @@ -613,19 +593,15 @@ "checkbox": [1.33, 1.33], "checkbox_mark": [1, 1], - "checkbox_square": [0.83, 0.83], "checkbox_radius": [0.25, 0.25], - "checkbox_label_padding": [0.5, 0.5], "tooltip": [20.0, 10.0], "tooltip_margins": [1.0, 1.0], "tooltip_arrow_margins": [2.0, 2.0], - "save_button_text_margin": [0.3, 0.6], "save_button_save_to_button": [0.3, 2.7], "save_button_specs_icons": [1.4, 1.4], - "job_specs_button": [2.7, 2.7], "first_run_shadow_radius": [1.2, 1.2], "monitor_preheat_temperature_control": [4.5, 2.0], From 1589475dd47bf802ae401d7dd344c502ec96a1b5 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Feb 2022 13:54:50 +0100 Subject: [PATCH 53/56] Remove a slew of unusued colors in the theme --- .../themes/cura-dark-colorblind/theme.json | 4 -- resources/themes/cura-dark/theme.json | 30 -------- .../themes/cura-light-colorblind/theme.json | 1 - resources/themes/cura-light/theme.json | 71 ------------------- 4 files changed, 106 deletions(-) diff --git a/resources/themes/cura-dark-colorblind/theme.json b/resources/themes/cura-dark-colorblind/theme.json index c98fb0c815..4a006ee836 100644 --- a/resources/themes/cura-dark-colorblind/theme.json +++ b/resources/themes/cura-dark-colorblind/theme.json @@ -8,12 +8,8 @@ "x_axis": [212, 0, 0, 255], "y_axis": [64, 64, 255, 255], - "model_default": [156, 201, 36, 255], "model_overhang": [200, 0, 255, 255], - - "xray_error_dark": [255, 0, 0, 255], - "xray_error_light": [255, 255, 0, 255], "xray": [26, 26, 62, 255], "xray_error": [255, 0, 0, 255], diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 56638cc3ef..936accdccd 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -34,8 +34,6 @@ "account_sync_state_icon": [255, 255, 255, 204], - "machine_selector_bar": [39, 44, 48, 255], - "machine_selector_active": [39, 44, 48, 255], "machine_selector_printer_icon": [204, 204, 204, 255], "text": [255, 255, 255, 204], @@ -43,8 +41,6 @@ "text_link": [25, 110, 240, 255], "text_inactive": [255, 255, 255, 88], "text_hover": [255, 255, 255, 204], - "text_pressed": [255, 255, 255, 204], - "text_subtext": [255, 255, 255, 172], "text_scene": [255, 255, 255, 162], "text_scene_hover": [255, 255, 255, 204], @@ -55,22 +51,14 @@ "button": [39, 44, 48, 255], "button_hover": [39, 44, 48, 255], - "button_active": [67, 72, 75, 255], - "button_active_hover": [67, 72, 75, 255], "button_text": [255, 255, 255, 197], "button_disabled": [39, 44, 48, 255], "button_disabled_text": [255, 255, 255, 101], - "small_button": [39, 44, 48, 0], - "small_button_hover": [39, 44, 48, 255], - "small_button_active": [67, 72, 75, 255], - "small_button_active_hover": [67, 72, 75, 255], "small_button_text": [255, 255, 255, 197], "small_button_text_hover": [255, 255, 255, 255], "button_tooltip": [39, 44, 48, 255], - "button_tooltip_border": [39, 44, 48, 255], - "button_tooltip_text": [255, 255, 255, 172], "tab_checked": [39, 44, 48, 255], "tab_checked_border": [255, 255, 255, 30], @@ -87,17 +75,9 @@ "tab_background": [39, 44, 48, 255], "action_button": [39, 44, 48, 255], - "action_button_text": [255, 255, 255, 200], - "action_button_border": [255, 255, 255, 30], "action_button_hovered": [79, 85, 89, 255], - "action_button_hovered_text": [255, 255, 255, 255], - "action_button_hovered_border": [255, 255, 255, 30], - "action_button_active": [39, 44, 48, 30], - "action_button_active_text": [255, 255, 255, 255], - "action_button_active_border": [255, 255, 255, 100], "action_button_disabled": [85, 85, 87, 255], "action_button_disabled_text": [103, 103, 104, 255], - "action_button_disabled_border": [255, 255, 255, 30], "scrollbar_background": [39, 44, 48, 0], "scrollbar_handle": [255, 255, 255, 105], @@ -107,21 +87,11 @@ "setting_category": [75, 80, 83, 255], "setting_category_disabled": [75, 80, 83, 255], "setting_category_hover": [75, 80, 83, 255], - "setting_category_active": [75, 80, 83, 255], - "setting_category_active_hover": [75, 80, 83, 255], "setting_category_text": [255, 255, 255, 152], "setting_category_disabled_text": [255, 255, 255, 101], - "setting_category_hover_text": [255, 255, 255, 204], "setting_category_active_text": [255, 255, 255, 204], - "setting_category_active_hover_text": [255, 255, 255, 204], - "setting_category_border": [39, 44, 48, 0], - "setting_category_disabled_border": [39, 44, 48, 0], - "setting_category_hover_border": [12, 169, 227, 255], - "setting_category_active_border": [39, 44, 48, 0], - "setting_category_active_hover_border": [12, 169, 227, 255], "setting_control": [43, 48, 52, 255], - "setting_control_selected": [34, 39, 42, 38], "setting_control_highlight": [43, 48, 52, 255], "setting_control_border": [255, 255, 255, 38], "setting_control_border_highlight": [12, 169, 227, 255], diff --git a/resources/themes/cura-light-colorblind/theme.json b/resources/themes/cura-light-colorblind/theme.json index 5628fad880..740bf977b2 100644 --- a/resources/themes/cura-light-colorblind/theme.json +++ b/resources/themes/cura-light-colorblind/theme.json @@ -8,7 +8,6 @@ "x_axis": [200, 0, 0, 255], "y_axis": [64, 64, 255, 255], - "model_default": [156, 201, 36, 255], "model_overhang": [200, 0, 255, 255], "model_selection_outline": [12, 169, 227, 255], diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index e35b7c923f..2d846f20b8 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -171,7 +171,6 @@ }, "colors": { - "main_background": [255, 255, 255, 255], "detail_background": [243, 243, 243, 255], "wide_lining": [245, 245, 245, 255], @@ -180,20 +179,14 @@ "viewport_overlay": [246, 246, 246, 255], "primary": [25, 110, 240, 255], - "primary_shadow": [64, 47, 205, 255], "primary_hover": [48, 182, 231, 255], "primary_text": [255, 255, 255, 255], - "border": [127, 127, 127, 255], "text_selection": [156, 195, 255, 127], "secondary": [240, 240, 240, 255], - "secondary_shadow": [216, 216, 216, 255], - - "text_lighter": [108, 108, 108, 255], "icon": [8, 7, 63, 255], "primary_button": [25, 110, 240, 255], - "primary_button_shadow": [27, 95, 202, 255], "primary_button_hover": [16, 70, 156, 255], "primary_button_text": [255, 255, 255, 255], @@ -214,10 +207,6 @@ "account_widget_outline_active": [70, 66, 126, 255], "account_sync_state_icon": [25, 25, 25, 255], - "machine_selector_bar": [31, 36, 39, 255], - "machine_selector_active": [68, 72, 75, 255], - "machine_selector_hover": [68, 72, 75, 255], - "machine_selector_text_active": [255, 255, 255, 255], "machine_selector_printer_icon": [8, 7, 63, 255], "action_panel_secondary": [25, 110, 240, 255], @@ -236,10 +225,7 @@ "text_detail": [174, 174, 174, 128], "text_link": [25, 110, 240, 255], "text_inactive": [174, 174, 174, 255], - "text_pressed": [50, 130, 255, 255], - "text_subtext": [0, 0, 0, 255], "text_medium": [128, 128, 128, 255], - "text_emphasis": [255, 255, 255, 255], "text_scene": [102, 102, 102, 255], "text_scene_hover": [123, 123, 113, 255], @@ -252,48 +238,20 @@ "toolbar_button_active": [232, 242, 252, 255], "toolbar_button_active_hover": [232, 242, 252, 255], - "button": [31, 36, 39, 255], - "button_hover": [68, 72, 75, 255], - "button_active": [68, 72, 75, 255], - "button_active_hover": [68, 72, 75, 255], "button_text": [255, 255, 255, 255], - "button_text_hover": [255, 255, 255, 255], - "button_text_active": [255, 255, 255, 255], - "button_text_active_hover": [255, 255, 255, 255], - "small_button": [0, 0, 0, 0], - "small_button_hover": [102, 102, 102, 255], - "small_button_active": [10, 8, 80, 255], - "small_button_active_hover": [10, 8, 80, 255], "small_button_text": [102, 102, 102, 255], "small_button_text_hover": [8, 7, 63, 255], - "small_button_text_active": [255, 255, 255, 255], - "small_button_text_active_hover": [255, 255, 255, 255], "button_tooltip": [31, 36, 39, 255], - "button_tooltip_border": [68, 192, 255, 255], - "button_tooltip_text": [192, 193, 194, 255], - "extruder_button_material_border": [255, 255, 255, 255], "extruder_disabled": [255, 255, 255, 102], - "sync_button_text": [120, 120, 120, 255], - "sync_button_text_hovered": [0, 0, 0, 255], - "action_button": [255, 255, 255, 255], - "action_button_text": [0, 0, 0, 255], - "action_button_border": [127, 127, 127, 255], "action_button_hovered": [232, 242, 252, 255], - "action_button_hovered_text": [31, 36, 39, 255], - "action_button_hovered_border": [50, 130, 255, 255], - "action_button_active": [255, 255, 255, 255], - "action_button_active_text": [0, 0, 0, 255], - "action_button_active_border": [50, 130, 255, 255], "action_button_disabled": [245, 245, 245, 255], "action_button_disabled_text": [196, 196, 196, 255], - "action_button_disabled_border": [196, 196, 196, 255], "action_button_shadow": [223, 223, 223, 255], - "action_button_disabled_shadow": [228, 228, 228, 255], "scrollbar_background": [255, 255, 255, 255], "scrollbar_handle": [10, 8, 80, 255], @@ -303,21 +261,11 @@ "setting_category": [240, 240, 240, 255], "setting_category_disabled": [255, 255, 255, 255], "setting_category_hover": [232, 242, 252, 255], - "setting_category_active": [240, 240, 240, 255], - "setting_category_active_hover": [232, 242, 252, 255], "setting_category_text": [35, 35, 35, 255], "setting_category_disabled_text": [24, 41, 77, 101], "setting_category_active_text": [35, 35, 35, 255], - "setting_category_active_hover_text": [35, 35, 35, 255], - "setting_category_hover_text": [35, 35, 35, 255], - "setting_category_border": [240, 240, 240, 255], - "setting_category_disabled_border": [240, 240, 240, 255], - "setting_category_hover_border": [50, 130, 255, 255], - "setting_category_active_border": [50, 130, 255, 255], - "setting_category_active_hover_border": [50, 130, 255, 255], "setting_control": [255, 255, 255, 255], - "setting_control_selected": [31, 36, 39, 255], "setting_control_highlight": [255, 255, 255, 255], "setting_control_border": [199, 199, 199, 255], "setting_control_border_highlight": [50, 130, 255, 255], @@ -333,7 +281,6 @@ "setting_validation_warning_background": [255, 145, 62, 255], "setting_validation_warning": [127, 127, 127, 255], "setting_validation_ok": [255, 255, 255, 255], - "setting_filter_field" : [153, 153, 153, 255], "material_compatibility_warning": [243, 166, 59, 255], @@ -377,7 +324,6 @@ "status_busy": [50, 130, 255, 255], "status_paused": [255, 140, 0, 255], "status_stopped": [236, 82, 80, 255], - "status_unknown": [127, 127, 127, 255], "disabled_axis": [127, 127, 127, 255], "x_axis": [218, 30, 40, 255], @@ -395,17 +341,13 @@ "disallowed_area": [0, 0, 0, 40], "error_area": [255, 0, 0, 127], - "model_default": [255, 201, 36, 255], "model_overhang": [255, 0, 0, 255], "model_unslicable": [122, 122, 122, 255], "model_unslicable_alt": [172, 172, 127, 255], "model_selection_outline": [50, 130, 255, 255], "model_non_printing": [122, 122, 122, 255], - "xray_error_dark": [255, 0, 0, 255], - "xray_error_light": [255, 255, 0, 255], "xray": [26, 26, 62, 255], - "xray_error": [255, 0, 0, 255], "layerview_ghost": [31, 31, 31, 95], "layerview_none": [255, 255, 255, 255], @@ -423,16 +365,7 @@ "layerview_nozzle": [224, 192, 16, 64], "layerview_starts": [255, 255, 255, 255], - "tab_status_connected": [50, 130, 255, 255], - "tab_status_disconnected": [200, 200, 200, 255], - - "printer_config_matched": [50, 130, 255, 255], - "printer_config_mismatch": [127, 127, 127, 255], - "favorites_header_bar": [245, 245, 245, 255], - "favorites_header_hover": [245, 245, 245, 255], - "favorites_header_text": [31, 36, 39, 255], - "favorites_header_text_hover": [31, 36, 39, 255], "favorites_row_selected": [196, 239, 255, 255], "monitor_printer_family_tag": [228, 228, 242, 255], @@ -453,10 +386,6 @@ "monitor_stage_background": [246, 246, 246, 255], "monitor_stage_background_fade": [246, 246, 246, 102], - "monitor_progress_bar_fill": [50, 130, 255, 255], - "monitor_progress_bar_deactive": [192, 193, 194, 255], - "monitor_progress_bar_empty": [245, 245, 245, 255], - "monitor_tooltip": [25, 25, 25, 255], "monitor_tooltip_text": [255, 255, 255, 255], "monitor_context_menu": [255, 255, 255, 255], From 3f4f7f0fcfd97b6a4a97e0f803dc17b6df40a078 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Feb 2022 14:12:25 +0100 Subject: [PATCH 54/56] Remove some extra unneeded theme stuff for monitor page --- .../resources/qml/CameraButton.qml | 2 +- .../resources/qml/MonitorPrinterCard.qml | 64 ++++--------------- resources/themes/cura-dark/theme.json | 4 -- resources/themes/cura-light/theme.json | 5 -- 4 files changed, 13 insertions(+), 62 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml index cfd9801b97..4458b48996 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml @@ -18,7 +18,7 @@ Button { anchors.fill: parent radius: 0.5 * width - color: parent.enabled ? (parent.hovered ? UM.Theme.getColor("monitor_secondary_button_hover") : "transparent") : UM.Theme.getColor("monitor_icon_disabled") + color: parent.enabled ? (parent.hovered ? UM.Theme.getColor("monitor_card_hover") : "transparent") : UM.Theme.getColor("monitor_icon_disabled") } UM.RecolorImage diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 3297b16beb..e3da51f966 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -63,7 +63,7 @@ Item leftMargin: 36 * screenScaleFactor // TODO: Theme! verticalCenter: parent.verticalCenter } - spacing: 18 * screenScaleFactor // TODO: Theme! + spacing: UM.Theme.getSize("default_margin").width Rectangle { @@ -95,9 +95,9 @@ Item { id: printerNameLabel color: printer ? "transparent" : UM.Theme.getColor("monitor_skeleton_loading") - height: 18 * screenScaleFactor // TODO: Theme! + height: UM.Theme.getSize("default_margin").width width: parent.width - radius: 2 * screenScaleFactor // TODO: Theme! + radius: UM.Theme.getSize("default_radius").width UM.Label { @@ -106,8 +106,6 @@ Item font: UM.Theme.getFont("large") // 16pt, bold width: parent.width visible: printer - - // FIXED-LINE-HEIGHT: height: parent.height } } @@ -116,7 +114,7 @@ Item { color: UM.Theme.getColor("monitor_skeleton_loading") height: 18 * screenScaleFactor // TODO: Theme! - radius: 2 * screenScaleFactor // TODO: Theme! + radius: UM.Theme.getSize("default_radius").width visible: !printer width: 48 * screenScaleFactor // TODO: Theme! } @@ -160,22 +158,16 @@ Item } color: UM.Theme.getColor("text_link") source: UM.Theme.getIcon("LinkExternal") - width: 12 * screenScaleFactor - height: 12 * screenScaleFactor + width: UM.Theme.getSize("icon").width + height: UM.Theme.getSize("icon").height } } MouseArea { anchors.fill: managePrinterLink onClicked: OutputDevice.openPrinterControlPanel() - onEntered: - { - manageQueueText.font.underline = true - } - onExited: - { - manageQueueText.font.underline = false - } + onEntered: manageQueueText.font.underline = true + onExited: manageQueueText.font.underline = false } } @@ -327,7 +319,7 @@ Item leftMargin: 36 * screenScaleFactor // TODO: Theme! } height: childrenRect.height - spacing: 18 * screenScaleFactor // TODO: Theme! + spacing: UM.Theme.getSize("default_margin").width UM.Label { @@ -403,9 +395,6 @@ Item font: UM.Theme.getFont("large") // 16pt, bold text: printer && printer.activePrintJob ? printer.activePrintJob.name : catalog.i18nc("@label", "Untitled") width: parent.width - - // FIXED-LINE-HEIGHT: - height: 18 * screenScaleFactor // TODO: Theme! } UM.Label @@ -421,9 +410,6 @@ Item elide: Text.ElideRight text: printer && printer.activePrintJob ? printer.activePrintJob.owner : catalog.i18nc("@label", "Anonymous") width: parent.width - - // FIXED-LINE-HEIGHT: - height: 18 * screenScaleFactor // TODO: Theme! } } @@ -445,45 +431,19 @@ Item } text: catalog.i18nc("@label:status", "Requires configuration changes") visible: printer && printer.activePrintJob && printer.activePrintJob.configurationChanges.length > 0 && !printerStatus.visible - - // FIXED-LINE-HEIGHT: - height: 18 * screenScaleFactor // TODO: Theme! } } - Button + Cura.SecondaryButton { id: detailsButton anchors { verticalCenter: parent.verticalCenter right: parent.right - rightMargin: 18 * screenScaleFactor // TODO: Theme! + rightMargin: UM.Theme.getSize("default_margin").width } - background: Rectangle - { - color: UM.Theme.getColor("monitor_secondary_button_shadow") - radius: 2 * screenScaleFactor // Todo: Theme! - Rectangle - { - anchors.fill: parent - anchors.bottomMargin: 2 * screenScaleFactor // TODO: Theme! - color: detailsButton.hovered ? UM.Theme.getColor("monitor_secondary_button_hover") : UM.Theme.getColor("monitor_secondary_button") - radius: 2 * screenScaleFactor // Todo: Theme! - } - } - contentItem: UM.Label - { - anchors.fill: parent - anchors.bottomMargin: 2 * screenScaleFactor // TODO: Theme! - color: UM.Theme.getColor("monitor_secondary_button_text") - font: UM.Theme.getFont("medium") // 14pt, regular - text: catalog.i18nc("@action:button", "Details"); - horizontalAlignment: Text.AlignHCenter - height: 18 * screenScaleFactor // TODO: Theme! - } - implicitHeight: 32 * screenScaleFactor // TODO: Theme! - implicitWidth: 96 * screenScaleFactor // TODO: Theme! + text: catalog.i18nc("@action:button", "Details") visible: printer && printer.activePrintJob && printer.activePrintJob.configurationChanges.length > 0 && !printerStatus.visible onClicked: base.enabled ? overrideConfirmationDialog.open() : {} enabled: OutputDevice.supportsPrintJobActions diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 936accdccd..dd31a5aafa 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -149,10 +149,6 @@ "monitor_icon_disabled": [102, 102, 102, 255], "monitor_secondary_button_hover": [80, 80, 80, 255], - "monitor_secondary_button": [92, 92, 92, 255], - "monitor_secondary_button_text": [250, 250, 250, 255], - "monitor_secondary_button_shadow": [74, 74, 74, 255], - "monitor_card_border": [102, 102, 102, 255], "monitor_card_background": [51, 53, 54, 255], "monitor_card_hover": [84, 89, 95, 255], diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 2d846f20b8..db88296b61 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -374,11 +374,6 @@ "monitor_icon_accent": [255, 255, 255, 255], "monitor_icon_disabled": [238, 238, 238, 255], - "monitor_secondary_button_hover": [232, 242, 252, 255], - "monitor_secondary_button": [240, 240, 240, 255], - "monitor_secondary_button_text": [30, 102, 215, 255], - "monitor_secondary_button_shadow": [216, 216, 216, 255], - "monitor_card_border": [192, 193, 194, 255], "monitor_card_background": [255, 255, 255, 255], "monitor_card_hover": [232, 242, 252, 255], From 75ec6f508ca7a7133a12a158f2d720479aa8ad46 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Feb 2022 14:27:47 +0100 Subject: [PATCH 55/56] Remove unneeded fixed line hight properties No idea why this was even done, but there just isnt' a reason to use these. --- plugins/MonitorStage/MonitorMain.qml | 15 +++------------ .../resources/qml/MonitorPrintJobProgressBar.qml | 9 +-------- resources/themes/cura-light/theme.json | 2 -- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml index cfd33a70fe..ab98fa5f7c 100644 --- a/plugins/MonitorStage/MonitorMain.qml +++ b/plugins/MonitorStage/MonitorMain.qml @@ -3,7 +3,7 @@ import QtQuick 2.10 import QtQuick.Controls 2.0 -import UM 1.3 as UM +import UM 1.5 as UM import Cura 1.0 as Cura // We show a nice overlay on the 3D viewer when the current output device has no monitor view @@ -90,7 +90,7 @@ Rectangle visible: monitorViewComponent.sourceComponent == null // CASE 2: CAN MONITOR & NOT CONNECTED - Label + UM.Label { anchors { @@ -99,14 +99,10 @@ Rectangle visible: isNetworkConfigured && !isConnected text: catalog.i18nc("@info", "Please make sure your printer has a connection:\n- Check if the printer is turned on.\n- Check if the printer is connected to the network.\n- Check if you are signed in to discover cloud-connected printers.") font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") - wrapMode: Text.WordWrap - lineHeight: UM.Theme.getSize("monitor_text_line_large").height - lineHeightMode: Text.FixedHeight width: contentWidth } - Label + UM.Label { id: noNetworkLabel anchors @@ -116,11 +112,7 @@ Rectangle visible: !isNetworkConfigured && isNetworkConfigurable text: catalog.i18nc("@info", "Please connect your printer to the network.") font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") - wrapMode: Text.WordWrap width: contentWidth - lineHeight: UM.Theme.getSize("monitor_text_line_large").height - lineHeightMode: Text.FixedHeight } Item { @@ -129,7 +121,6 @@ Rectangle left: noNetworkLabel.left } visible: !isNetworkConfigured && isNetworkConfigurable - height: UM.Theme.getSize("monitor_text_line").height width: childrenRect.width UM.RecolorImage diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml index b2d6c7c610..65c37ffe16 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml @@ -18,7 +18,7 @@ Item property var printJob: null width: childrenRect.width - height: UM.Theme.getSize("monitor_text_line").height + height: percentLabel.height UM.ProgressBar { @@ -39,14 +39,11 @@ Item { left: progressBar.right leftMargin: UM.Theme.getSize("default_margin").width - verticalCenter: parent.verticalCenter } text: printJob ? Math.round(printJob.progress * 100) + "%" : "0%" color: printJob && printJob.isActive ? UM.Theme.getColor("text") : UM.Theme.getColor("monitor_text_disabled") width: contentWidth wrapMode: Text.NoWrap - // FIXED-LINE-HEIGHT: - height: UM.Theme.getSize("monitor_text_line").height } UM.Label { @@ -55,7 +52,6 @@ Item { left: percentLabel.right leftMargin: UM.Theme.getSize("default_margin").width - verticalCenter: parent.verticalCenter } wrapMode: Text.NoWrap text: @@ -111,8 +107,5 @@ Item } } width: contentWidth - - // FIXED-LINE-HEIGHT: - height: UM.Theme.getSize("monitor_text_line").height } } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index db88296b61..35b468551d 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -550,8 +550,6 @@ "avatar_image": [6.8, 6.8], - "monitor_text_line": [1.5, 1.5], - "monitor_text_line_large": [2.33, 2.33], "monitor_shadow_radius": [0.4, 0.4], "monitor_empty_state_offset": [5.6, 5.6], "monitor_empty_state_size": [35.0, 25.0], From c356d37e06a3a580d6e679955221530e174e3dda Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Feb 2022 14:32:34 +0100 Subject: [PATCH 56/56] Remove monitor_icon_size from theme --- plugins/MonitorStage/MonitorMain.qml | 4 ++-- resources/themes/cura-light/theme.json | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml index ab98fa5f7c..aa717ce95c 100644 --- a/plugins/MonitorStage/MonitorMain.qml +++ b/plugins/MonitorStage/MonitorMain.qml @@ -129,8 +129,8 @@ Rectangle anchors.verticalCenter: parent.verticalCenter color: UM.Theme.getColor("text_link") source: UM.Theme.getIcon("LinkExternal") - width: UM.Theme.getSize("monitor_external_link_icon").width - height: UM.Theme.getSize("monitor_external_link_icon").height + width: UM.Theme.getSize("icon_indicator").width + height: UM.Theme.getSize("icon_indicator").height } Label { diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 35b468551d..1072427559 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -553,7 +553,6 @@ "monitor_shadow_radius": [0.4, 0.4], "monitor_empty_state_offset": [5.6, 5.6], "monitor_empty_state_size": [35.0, 25.0], - "monitor_external_link_icon": [1.16, 1.16], "monitor_column": [18.0, 1.0], "monitor_progress_bar": [16.5, 1.0],