3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use Cura.MenuItem instead of UM.MenuItem

Browse source 
I didn't realise that Cura already had a menu item. To prevent
Confusion, i've changed Cura.MenuItem to use UM.MenuItem and let all
other menus use Cura.MenuItem
This commit is contained in:
Jaime van Kessel 2022-01-14 13:46:05 +01:00
parent bab9311284
commit 3130ea0f74
17 changed files with 96 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

21
resources/qml/Menus/MaterialMenu.qml
View file

@ -48,18 +48,17 @@ UM.Menu
enabled: updateModels
}
UM.MenuItem
Cura.MenuItem
{
text: catalog.i18nc("@label:category menu label", "Favorites")
enabled: false
visible: favoriteMaterialsModel.items.length > 0
height: visible ? implicitHeight: 0
}
Instantiator
{
model: favoriteMaterialsModel
delegate: UM.MenuItem
delegate: Cura.MenuItem
{
text: model.brand + " " + model.name
checkable: true
@ -81,7 +80,7 @@ UM.Menu
Instantiator
{
model: genericMaterialsModel
delegate: UM.MenuItem
delegate: Cura.MenuItem
{
text: model.name
checkable: true
@ -94,12 +93,12 @@ UM.Menu
}
}
MenuSeparator {}
Cura.MenuSeparator {}
Instantiator
{
model: brandModel
UM.Menu
Cura.Menu
{
id: brandMenu
title: brandName
@ -119,7 +118,7 @@ UM.Menu
Instantiator
{
model: brandMaterialColors
delegate: UM.MenuItem
delegate: Cura.MenuItem
{
text: model.name
checkable: true
@ -140,16 +139,16 @@ UM.Menu
onObjectRemoved: materialMenu.removeMenu(object)
}
MenuSeparator {}
Cura.MenuSeparator {}
UM.MenuItem
Cura.MenuItem
{
action: Cura.Actions.manageMaterials
}
MenuSeparator {}
Cura.MenuSeparator {}
UM.MenuItem
Cura.MenuItem
{
action: Cura.Actions.marketplaceMaterials
}