GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 06:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into CURA-7376_full_of_spiders

Browse Source
This commit is contained in:
Kostas Karmas 2020-08-11 13:59:39 +02:00
commit 50f399c652
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/Machines/Models/GlobalStacksModel.py
View File

@ -72,8 +72,8 @@ class GlobalStacksModel(ListModel):
section_name = self._catalog.i18nc("@info:title", section_name) section_name = self._catalog.i18nc("@info:title", section_name)
default_removal_warning = self._catalog.i18nc( default_removal_warning = self._catalog.i18nc(
"@label ({} is object name)", "@label {0} is the name of a printer that's about to be deleted.",
"Are you sure you wish to remove {}? This cannot be undone!", device_name "Are you sure you wish to remove {0}? This cannot be undone!", device_name
) )
removal_warning = container_stack.getMetaDataEntry("removal_warning", default_removal_warning) removal_warning = container_stack.getMetaDataEntry("removal_warning", default_removal_warning)

10
plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml
View File

@ -48,7 +48,15 @@ Item
onClicked: onClicked:
{ {
toolbox.viewPage = "overview" toolbox.viewPage = "overview"
toolbox.filterModelByProp("packages", "type", toolbox.viewCategory) if (toolbox.viewCategory == "material")
{
toolbox.filterModelByProp("authors", "package_types", "material")
}
else if (toolbox.viewCategory == "plugin")
{
toolbox.filterModelByProp("packages", "type", "plugin")
}
} }
style: ButtonStyle style: ButtonStyle
{ {