mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-12-01 14:51:07 -07:00
Update the settings menu to controls 2
CURA-8683
This commit is contained in:
parent
770f6f94c9
commit
2bad5c5cd3
8 changed files with 121 additions and 140 deletions
|
|
@ -1,15 +1,15 @@
|
|||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Copyright (c) 2022 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.10
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Controls 2.4
|
||||
|
||||
import UM 1.2 as UM
|
||||
import UM 1.5 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
Menu
|
||||
UM.Menu
|
||||
{
|
||||
id: menu
|
||||
id: nozzleMenu
|
||||
title: "Nozzle"
|
||||
|
||||
property int extruderIndex: 0
|
||||
|
|
@ -23,12 +23,13 @@ Menu
|
|||
{
|
||||
model: nozzleModel
|
||||
|
||||
MenuItem
|
||||
UM.MenuItem
|
||||
{
|
||||
text: model.hotend_name
|
||||
checkable: true
|
||||
checked: {
|
||||
var activeMachine = Cura.MachineManager.activeMachine
|
||||
property var activeMachine: Cura.MachineManager.activeMachine
|
||||
checked:
|
||||
{
|
||||
if (activeMachine === null)
|
||||
{
|
||||
return false
|
||||
|
|
@ -36,10 +37,8 @@ Menu
|
|||
var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex]
|
||||
return (extruder === undefined) ? false : (extruder.variant.name == model.hotend_name)
|
||||
}
|
||||
exclusiveGroup: group
|
||||
enabled:
|
||||
{
|
||||
var activeMachine = Cura.MachineManager.activeMachine
|
||||
if (activeMachine === null)
|
||||
{
|
||||
return false
|
||||
|
|
@ -47,14 +46,14 @@ Menu
|
|||
var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex]
|
||||
return (extruder === undefined) ? false : extruder.isEnabled
|
||||
}
|
||||
onTriggered: {
|
||||
Cura.MachineManager.setVariant(menu.extruderIndex, model.container_node);
|
||||
}
|
||||
onTriggered:Cura.MachineManager.setVariant(nozzleMenu.extruderIndex, model.container_node)
|
||||
}
|
||||
|
||||
onObjectAdded: menu.insertItem(index, object);
|
||||
onObjectRemoved: menu.removeItem(object);
|
||||
onObjectAdded:
|
||||
{
|
||||
nozzleMenu.insertItem(index, object)
|
||||
}
|
||||
onObjectRemoved: nozzleMenu.removeItem(object)
|
||||
}
|
||||
|
||||
ExclusiveGroup { id: group }
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue