3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-30 06:11:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

25
resources/qml/Menus/PrinterMenu.qml
View file

@ -11,7 +11,7 @@ Menu
{
id: menu
UM.MenuItem
Cura.MenuItem
{
id: networkEnabledPrinterItem
text: catalog.i18nc("@label:category menu label", "Network enabled printers")
@ -22,8 +22,8 @@ Menu
Instantiator
{
id: networKPrinterInstantiator
model: Cura.GlobalStacksModel {filterOnlineOnly: true}
UM.MenuItem
model: Cura.GlobalStacksModel {filterOnlineOnly: true }
Cura.MenuItem
{
property string connectGroupName:
{
@ -42,12 +42,9 @@ Menu
onObjectRemoved: menu.removeItem(object)
}
MenuSeparator
{
visible: networKPrinterInstantiator.count > 0
}
Cura.MenuSeparator { visible: networKPrinterInstantiator.count > 0 }
UM.MenuItem
Cura.MenuItem
{
id: localPrinterMenu
text: catalog.i18nc("@label:category menu label", "Local printers")
@ -60,13 +57,12 @@ Menu
id: localPrinterInstantiator
model: Cura.GlobalStacksModel {}
UM.MenuItem
Cura.MenuItem
{
text: model.name
checkable: true
checked: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.id == model.id: false
visible: !model.hasRemoteConnection
height: visible ? implicitHeight: 0
onTriggered: Cura.MachineManager.setActiveMachine(model.id)
}
// A bit hackish, but we have 2 items at the end, put them before that
@ -74,11 +70,8 @@ Menu
onObjectRemoved: menu.removeItem(object)
}
MenuSeparator
{
visible: localPrinterInstantiator.count > 0
}
Cura.MenuSeparator { visible: localPrinterInstantiator.count > 0 }
UM.MenuItem { action: Cura.Actions.addMachine }
UM.MenuItem { action: Cura.Actions.configureMachines }
Cura.MenuItem { action: Cura.Actions.addMachine }
Cura.MenuItem { action: Cura.Actions.configureMachines }
}