From c7525719d534bb6ebf9cbe85a86780b678cec4ed Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Tue, 11 Aug 2020 11:18:37 +0200 Subject: [PATCH 1/3] Fix wrong filtering in Marketplace when pressing Back It was trying to apply a wrong filter, which was causing a slowdown. It is now applying the correct filter. Fixes https://github.com/Ultimaker/Cura/issues/8161 CURA-7649 --- plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml index dba9f19ccd..cbf48fc57f 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml @@ -48,7 +48,7 @@ Item onClicked: { toolbox.viewPage = "overview" - toolbox.filterModelByProp("packages", "type", toolbox.viewCategory) + toolbox.filterModelByProp("packages", "package_types", toolbox.viewCategory) } style: ButtonStyle { From 23ba40e54ff514f89f6ec63e390581da3ad43ce8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 11 Aug 2020 11:27:11 +0200 Subject: [PATCH 2/3] Clarify replacement key in translated text This is done as a reaction to translators asking what the brackets mean. --- cura/Machines/Models/GlobalStacksModel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/GlobalStacksModel.py b/cura/Machines/Models/GlobalStacksModel.py index 6d091659a8..712597c2e7 100644 --- a/cura/Machines/Models/GlobalStacksModel.py +++ b/cura/Machines/Models/GlobalStacksModel.py @@ -72,8 +72,8 @@ class GlobalStacksModel(ListModel): section_name = self._catalog.i18nc("@info:title", section_name) default_removal_warning = self._catalog.i18nc( - "@label ({} is object name)", - "Are you sure you wish to remove {}? This cannot be undone!", device_name + "@label {0} is the name of a printer that's about to be deleted.", + "Are you sure you wish to remove {0}? This cannot be undone!", device_name ) removal_warning = container_stack.getMetaDataEntry("removal_warning", default_removal_warning) From ccd4add3efa61c4425fa7b01b9a3224c1402315e Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Tue, 11 Aug 2020 11:32:53 +0200 Subject: [PATCH 3/3] Apply different filtering per category when pressing Back Back now applies the same filters that are applied when pressing the tab buttons. CURA-7649 --- .../resources/qml/components/ToolboxBackColumn.qml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml index cbf48fc57f..5514e555eb 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml @@ -48,7 +48,15 @@ Item onClicked: { toolbox.viewPage = "overview" - toolbox.filterModelByProp("packages", "package_types", toolbox.viewCategory) + if (toolbox.viewCategory == "material") + { + toolbox.filterModelByProp("authors", "package_types", "material") + } + else if (toolbox.viewCategory == "plugin") + { + toolbox.filterModelByProp("packages", "type", "plugin") + } + } style: ButtonStyle {