Merge branch 'feature_extension_separator' of https://github.com/fieldOfView/Cura

This commit is contained in:
Jaime van Kessel 2020-03-23 14:17:42 +01:00
commit 3e58d96da4
No known key found for this signature in database
GPG Key ID: 3710727397403C91

View File

@ -68,13 +68,17 @@ Item
Instantiator Instantiator
{ {
model: actions model: actions
MenuItem Loader
{ {
text: model.text property var extensionsModel: extensions.model
onTriggered: extensions.model.subMenuTriggered(name, model.text) property var modelText: model.text
property var extensionName: name
sourceComponent: modelText.trim() == "" ? extensionsMenuSeparator : extensionsMenuItem
} }
onObjectAdded: sub_menu.insertItem(index, object)
onObjectRemoved: sub_menu.removeItem(object) onObjectAdded: sub_menu.insertItem(index, object.item)
onObjectRemoved: sub_menu.removeItem(object.item)
} }
} }
@ -106,6 +110,25 @@ Item
} }
} }
Component
{
id: extensionsMenuItem
MenuItem
{
text: modelText
onTriggered: extensionsModel.subMenuTriggered(extensionName, modelText)
}
}
Component
{
id: extensionsMenuSeparator
MenuSeparator {}
}
// ############################################################################################### // ###############################################################################################
// Definition of other components that are linked to the menus // Definition of other components that are linked to the menus
// ############################################################################################### // ###############################################################################################