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

CURA-4525 solved merge conflict

Browse source
This commit is contained in:
Jack Ha 2018-01-04 10:24:30 +01:00
commit 8854a28d56
20 changed files with 519 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,11 +31,21 @@ Menu
ExclusiveGroup { id: group }
MenuSeparator {}
MenuItem { action: Cura.Actions.homeCamera; }
Menu
{
title: catalog.i18nc("@action:inmenu menubar:view","&Camera position");
MenuItem { action: Cura.Actions.view3DCamera; }
MenuItem { action: Cura.Actions.viewFrontCamera; }
MenuItem { action: Cura.Actions.viewTopCamera; }
MenuItem { action: Cura.Actions.viewLeftSideCamera; }
MenuItem { action: Cura.Actions.viewRightSideCamera; }
}
MenuSeparator {
visible: UM.Preferences.getValue("cura/use_multi_build_plate")
}
Instantiator
{
model: Cura.BuildPlateModel
@ -53,5 +63,6 @@ Menu
ExclusiveGroup { id: buildPlateGroup; }
MenuSeparator {}
MenuItem { action: Cura.Actions.expandSidebar; }
}