mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-07 22:13:58 -06:00
Merge branch 'CURA-8683_replace_controls_windows_and_menus' of github.com:Ultimaker/Cura into CURA-8683_replace_controls_windows_and_menus
This commit is contained in:
commit
bf65f77310
3 changed files with 4 additions and 7 deletions
|
@ -46,13 +46,10 @@ UM.Menu
|
|||
var extruder = activeMachine.extruderList[extruderIndex]
|
||||
return (extruder === undefined) ? false : extruder.isEnabled
|
||||
}
|
||||
onTriggered:Cura.MachineManager.setVariant(nozzleMenu.extruderIndex, model.container_node)
|
||||
onTriggered: Cura.MachineManager.setVariant(nozzleMenu.extruderIndex, model.container_node)
|
||||
}
|
||||
|
||||
onObjectAdded:
|
||||
{
|
||||
nozzleMenu.insertItem(index, object)
|
||||
}
|
||||
onObjectAdded: nozzleMenu.insertItem(index, object)
|
||||
onObjectRemoved: nozzleMenu.removeItem(object)
|
||||
}
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ Menu
|
|||
{
|
||||
id: cameraViewMenu
|
||||
|
||||
title: catalog.i18nc("@action:inmenu menubar:view","Camera view")
|
||||
title: catalog.i18nc("@action:inmenu menubar:view", "Camera view")
|
||||
property string cameraMode: UM.Preferences.getValue("general/camera_perspective_mode")
|
||||
|
||||
Connections
|
||||
|
|
|
@ -15,7 +15,7 @@ MenuItem
|
|||
|
||||
implicitHeight: UM.Theme.getSize("setting_control").height + UM.Theme.getSize("narrow_margin").height
|
||||
opacity: enabled ? 1.0 : 0.5
|
||||
height: visible ? implicitHeight: 0
|
||||
height: visible ? implicitHeight : 0
|
||||
|
||||
arrow: UM.RecolorImage
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue