3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'master' into feature_intent

Browse source 
Conflicts:
	resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously
	tests/TestMachineManager.py -> Due to changes in conftest.py
	tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties
This commit is contained in:
Ghostkeeper 2019-08-13 14:43:28 +02:00
commit 20201c65e6
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
1386 changed files with 33217 additions and 35219 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/Menus/FileMenu.qml
View file

@ -29,6 +29,7 @@ Menu
MenuItem
{
id: saveWorkspaceMenu
shortcut: StandardKey.Save
text: catalog.i18nc("@title:menu menubar:file", "&Save...")
onTriggered:
{

1
resources/qml/Menus/NozzleMenu.qml
View file

@ -31,6 +31,7 @@ Menu
return Cura.MachineManager.activeVariantNames[extruderIndex] == model.hotend_name
}
exclusiveGroup: group
onTriggered: {
Cura.MachineManager.setVariant(menu.extruderIndex, model.container_node);
}

7
resources/qml/Menus/SettingsMenu.qml
View file

@ -15,15 +15,10 @@ Menu
PrinterMenu { title: catalog.i18nc("@title:menu menubar:settings", "&Printer") }
property var activeMachine: Cura.MachineManager.activeMachine
onAboutToShow: extruderInstantiator.active = true
onAboutToHide: extruderInstantiator.active = false
Instantiator
{
id: extruderInstantiator
model: activeMachine == null ? null : activeMachine.extruderList
active: false
asynchronous: true
Menu
{
title: modelData.name
@ -52,7 +47,7 @@ Menu
MenuItem
{
text: catalog.i18nc("@action:inmenu", "Disable Extruder")
onTriggered: Cura.MachineManager.setExtruderEnabled(model.index, false)
onTriggered: Cura.MachineManager.setExtruderEnabled(index, false)
visible: Cura.MachineManager.getExtruder(model.index).isEnabled
enabled: Cura.MachineManager.numberExtrudersEnabled > 1
}

6
resources/qml/Menus/ViewMenu.qml
View file

@ -58,11 +58,11 @@ Menu
{
text: catalog.i18nc("@action:inmenu menubar:view", "Orthographic")
checkable: true
checked: cameraViewMenu.cameraMode == "orthogonal"
checked: cameraViewMenu.cameraMode == "orthographic"
onTriggered:
{
UM.Preferences.setValue("general/camera_perspective_mode", "orthogonal")
checked = cameraViewMenu.cameraMode == "orthogonal"
UM.Preferences.setValue("general/camera_perspective_mode", "orthographic")
checked = cameraViewMenu.cameraMode == "orthographic"
}
exclusiveGroup: group
}