Use Cura.MenuItem instead of UM.MenuItem

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

View file

@ -14,18 +14,17 @@ Menu
property var fileProviderModel: CuraApplication.getFileProviderModel()
UM.MenuItem
Cura.MenuItem
{
id: newProjectMenu
action: Cura.Actions.newProject
}
UM.MenuItem
Cura.MenuItem
{
id: openMenu
action: Cura.Actions.open
visible: base.fileProviderModel.count == 1
height: visible ? implicitHeight: 0
}
OpenFilesMenu
@ -37,13 +36,12 @@ Menu
RecentFilesMenu { }
UM.MenuItem
Cura.MenuItem
{
id: saveWorkspaceMenu
shortcut: StandardKey.Save
text: catalog.i18nc("@title:menu menubar:file", "&Save Project...")
visible: saveProjectMenu.model.count == 1
height: visible ? implicitHeight : 0
enabled: UM.WorkspaceFileHandler.enabled
onTriggered:
{
@ -72,7 +70,7 @@ Menu
MenuSeparator { }
UM.MenuItem
Cura.MenuItem
{
id: saveAsMenu
text: catalog.i18nc("@title:menu menubar:file", "&Export...")
@ -83,7 +81,7 @@ Menu
}
}
UM.MenuItem
Cura.MenuItem
{
id: exportSelectionMenu
text: catalog.i18nc("@action:inmenu menubar:file", "Export Selection...")
@ -94,7 +92,7 @@ Menu
MenuSeparator { }
UM.MenuItem
Cura.MenuItem
{
id: reloadAllMenu
action: Cura.Actions.reloadAll
@ -102,5 +100,5 @@ Menu
MenuSeparator { }
UM.MenuItem { action: Cura.Actions.quit }
Cura.MenuItem { action: Cura.Actions.quit }
}