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

Merge pull request #12009 from Ultimaker/CURA-9222_crash_for_multiple_extruders

Browse Source 
Use the correct function parameters when removing objects in menu
This commit is contained in:
Joey de l'Arago 2022-04-29 08:06:29 +01:00 committed by GitHub
commit d518c3a0ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/PostProcessingPlugin/PostProcessingPlugin.qml
View File

@ -232,7 +232,7 @@ UM.Dialog
} }
onObjectAdded: function(index, object) { scriptsMenu.insertItem(index, object)} onObjectAdded: function(index, object) { scriptsMenu.insertItem(index, object)}
onObjectRemoved: function(object) { scriptsMenu.removeItem(object) } onObjectRemoved: function(index, object) { scriptsMenu.removeItem(object) }
} }
} }

2
resources/qml/Menus/ContextMenu.qml
View File

@ -46,7 +46,7 @@ Cura.Menu
} }
// Add it to the fifth position (and above) as we want it to be added after the extruder header. // Add it to the fifth position (and above) as we want it to be added after the extruder header.
onObjectAdded: function(index, object) { base.insertItem(index + 5, object) } onObjectAdded: function(index, object) { base.insertItem(index + 5, object) }
onObjectRemoved: function(object) { base.removeItem(object) } onObjectRemoved: function(index, object) { base.removeItem(object) }
} }
// Global actions // Global actions

4
resources/qml/Menus/ExtensionMenu.qml
View File

@ -54,11 +54,11 @@ Cura.Menu
} }
onObjectAdded: function(index, object) { sub_menu.insertItem(index, object.item)} onObjectAdded: function(index, object) { sub_menu.insertItem(index, object.item)}
onObjectRemoved: function(object) { sub_menu.removeItem(object.item)} onObjectRemoved: function(index, object) { sub_menu.removeItem(object.item)}
} }
} }
onObjectAdded: function(index, object) { extensionMenu.insertMenu(index, object) } onObjectAdded: function(index, object) { extensionMenu.insertMenu(index, object) }
onObjectRemoved: function(object) { extensionMenu.removeMenu(object)} onObjectRemoved: function(index, object) { extensionMenu.removeMenu(object)}
} }
} }

6
resources/qml/Menus/MaterialMenu.qml
View File

@ -67,7 +67,7 @@ Cura.Menu
onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node) onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node)
} }
onObjectAdded: function(index, object) { materialMenu.insertItem(index + 1, object) } onObjectAdded: function(index, object) { materialMenu.insertItem(index + 1, object) }
onObjectRemoved: function(object) { materialMenu.removeItem(index) } onObjectRemoved: function(index, object) { materialMenu.removeItem(index) }
} }
Cura.MenuSeparator { visible: favoriteMaterialsModel.items.length > 0} Cura.MenuSeparator { visible: favoriteMaterialsModel.items.length > 0}
@ -89,7 +89,7 @@ Cura.Menu
onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node) onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node)
} }
onObjectAdded: function(index, object) { genericMenu.insertItem(index, object)} onObjectAdded: function(index, object) { genericMenu.insertItem(index, object)}
onObjectRemoved: function(object) {genericMenu.removeItem(index) } onObjectRemoved: function(index, object) {genericMenu.removeItem(index) }
} }
} }
@ -103,7 +103,7 @@ Cura.Menu
materialTypesModel: model materialTypesModel: model
} }
onObjectAdded: function(index, object) { materialMenu.insertItem(index + 4, object)} onObjectAdded: function(index, object) { materialMenu.insertItem(index + 4, object)}
onObjectRemoved: function(object) { materialMenu.removeItem(index) } onObjectRemoved: function(index, object) { materialMenu.removeItem(index) }
} }
Cura.MenuSeparator {} Cura.MenuSeparator {}

2
resources/qml/Menus/NozzleMenu.qml
View File

@ -50,7 +50,7 @@ Cura.Menu
} }
onObjectAdded: function(index, object) { nozzleMenu.insertItem(index, object) } onObjectAdded: function(index, object) { nozzleMenu.insertItem(index, object) }
onObjectRemoved: function(object) {nozzleMenu.removeItem(object)} onObjectRemoved: function(index, object) {nozzleMenu.removeItem(object)}
} }
} }

2
resources/qml/Menus/OpenFilesMenu.qml
View File

@ -36,6 +36,6 @@ Cura.Menu
} }
onObjectAdded: function(index, object) { openFilesMenu.insertItem(index, object)} onObjectAdded: function(index, object) { openFilesMenu.insertItem(index, object)}
onObjectRemoved: function(object) { openFilesMenu.removeItem(object) } onObjectRemoved: function(index, object) { openFilesMenu.removeItem(object) }
} }
} }

4
resources/qml/Menus/PrinterMenu.qml
View File

@ -39,7 +39,7 @@ Cura.Menu
onTriggered: Cura.MachineManager.setActiveMachine(model.id) onTriggered: Cura.MachineManager.setActiveMachine(model.id)
} }
onObjectAdded: function(index, object) { menu.insertItem(2, object)} onObjectAdded: function(index, object) { menu.insertItem(2, object)}
onObjectRemoved: function(object) { menu.removeItem(object)} onObjectRemoved: function(index, object) { menu.removeItem(object)}
} }
Cura.MenuSeparator { visible: networKPrinterInstantiator.count > 0 } Cura.MenuSeparator { visible: networKPrinterInstantiator.count > 0 }
@ -67,7 +67,7 @@ Cura.Menu
} }
// A bit hackish, but we have 2 items at the end, put them before that // A bit hackish, but we have 2 items at the end, put them before that
onObjectAdded: function(index, object) { menu.insertItem(menu.count - 2, object) } onObjectAdded: function(index, object) { menu.insertItem(menu.count - 2, object) }
onObjectRemoved: function(object) { menu.removeItem(object) } onObjectRemoved: function(index, object) { menu.removeItem(object) }
} }
Cura.MenuSeparator { visible: localPrinterInstantiator.count > 0 } Cura.MenuSeparator { visible: localPrinterInstantiator.count > 0 }

2
resources/qml/Menus/PrinterTypeMenu.qml
View File

@ -29,6 +29,6 @@ Cura.Menu
} }
} }
onObjectAdded: function(index, object) { return menu.insertItem(index, object); } onObjectAdded: function(index, object) { return menu.insertItem(index, object); }
onObjectRemoved: function(object) { return menu.removeItem(object); } onObjectRemoved: function(index, object) { return menu.removeItem(object); }
} }
} }

2
resources/qml/Menus/SaveProjectMenu.qml
View File

@ -44,7 +44,7 @@ Cura.Menu
enabled: saveProjectMenu.shouldBeVisible enabled: saveProjectMenu.shouldBeVisible
} }
onObjectAdded: function(index, object) { saveProjectMenu.insertItem(index, object)} onObjectAdded: function(index, object) { saveProjectMenu.insertItem(index, object)}
onObjectRemoved: function(object) { saveProjectMenu.removeItem(object)} onObjectRemoved: function(index, object) { saveProjectMenu.removeItem(object)}
} }
WorkspaceSummaryDialog WorkspaceSummaryDialog

2
resources/qml/Menus/SettingVisibilityPresetsMenu.qml
View File

@ -33,7 +33,7 @@ Cura.Menu
} }
onObjectAdded: function(index, object) { menu.insertItem(index, object) } onObjectAdded: function(index, object) { menu.insertItem(index, object) }
onObjectRemoved: function(object) { menu.removeItem(object)} onObjectRemoved: function(index, object) { menu.removeItem(object)}
} }
Cura.MenuSeparator {} Cura.MenuSeparator {}

2
resources/qml/Menus/SettingsMenu.qml
View File

@ -68,7 +68,7 @@ Cura.Menu
} }
} }
onObjectAdded: function(index, object) { base.insertMenu(index, object) } onObjectAdded: function(index, object) { base.insertMenu(index, object) }
onObjectRemoved:function(object) { base.removeMenu(object)} onObjectRemoved: function(index, object) { base.removeMenu(object);}
} }
Cura.MenuSeparator { } Cura.MenuSeparator { }