Merge branch 'main' into CURA-11596-open-url-singleinstance

This commit is contained in:
Saumya Jain 2024-02-08 10:52:11 +01:00 committed by GitHub
commit 84ecf8ec8f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions

View file

@ -12,7 +12,6 @@ import Cura 1.0 as Cura
UM.ManagementPage
{
id: base
property var machineActionManager: CuraApplication.getMachineActionManager()
Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} }
title: catalog.i18nc("@title:tab", "Printers")
@ -63,7 +62,7 @@ UM.ManagementPage
Repeater
{
id: machineActionRepeater
model: base.currentItem.id ? machineActionManager.getSupportedActions(Cura.MachineManager.getDefinitionByMachineId(base.currentItem.id)) : null
model: base.currentItem ? CuraApplication.getSupportedActionMachineList(base.currentItem.id) : null
Item
{