Switch out the file, view and edit menu for controls 2

CURA-8683
This commit is contained in:
Jaime van Kessel 2022-01-10 16:55:28 +01:00
parent 58a3aef8d4
commit 052898ce21
9 changed files with 285 additions and 251 deletions

View file

@ -2,33 +2,34 @@
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls 2.1
import UM 1.2 as UM
import UM 1.5 as UM
import Cura 1.0 as Cura
Menu
{
title: catalog.i18nc("@title:menu menubar:toplevel", "&View")
id: base
property var multiBuildPlateModel: CuraApplication.getMultiBuildPlateModel()
title: catalog.i18nc("@title:menu menubar:toplevel", "&View")
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.viewBottomCamera; }
MenuItem { action: Cura.Actions.viewLeftSideCamera; }
MenuItem { action: Cura.Actions.viewRightSideCamera; }
title: catalog.i18nc("@action:inmenu menubar:view", "&Camera position")
UM.MenuItem { action: Cura.Actions.view3DCamera }
UM.MenuItem { action: Cura.Actions.viewFrontCamera }
UM.MenuItem { action: Cura.Actions.viewTopCamera }
UM.MenuItem { action: Cura.Actions.viewBottomCamera }
UM.MenuItem { action: Cura.Actions.viewLeftSideCamera }
UM.MenuItem { action: Cura.Actions.viewRightSideCamera }
}
Menu
{
id: cameraViewMenu
title: catalog.i18nc("@action:inmenu menubar:view","Camera view")
property string cameraMode: UM.Preferences.getValue("general/camera_perspective_mode")
Connections
{
target: UM.Preferences
@ -42,7 +43,6 @@ Menu
}
}
title: catalog.i18nc("@action:inmenu menubar:view","Camera view")
MenuItem
{
text: catalog.i18nc("@action:inmenu menubar:view", "Perspective")
@ -52,8 +52,9 @@ Menu
{
UM.Preferences.setValue("general/camera_perspective_mode", "perspective")
}
exclusiveGroup: group
//exclusiveGroup: group
}
MenuItem
{
text: catalog.i18nc("@action:inmenu menubar:view", "Orthographic")
@ -63,45 +64,14 @@ Menu
{
UM.Preferences.setValue("general/camera_perspective_mode", "orthographic")
}
exclusiveGroup: group
}
ExclusiveGroup { id: group }
}
MenuSeparator
{
visible: UM.Preferences.getValue("cura/use_multi_build_plate")
}
Menu
{
id: buildPlateMenu;
title: catalog.i18nc("@action:inmenu menubar:view","&Build plate")
visible: UM.Preferences.getValue("cura/use_multi_build_plate")
Instantiator
{
model: base.multiBuildPlateModel
MenuItem
{
text: base.multiBuildPlateModel.getItem(index).name;
onTriggered: Cura.SceneController.setActiveBuildPlate(base.multiBuildPlateModel.getItem(index).buildPlateNumber)
checkable: true
checked: base.multiBuildPlateModel.getItem(index).buildPlateNumber == base.multiBuildPlateModel.activeBuildPlate
exclusiveGroup: buildPlateGroup
visible: UM.Preferences.getValue("cura/use_multi_build_plate")
}
onObjectAdded: buildPlateMenu.insertItem(index, object)
onObjectRemoved: buildPlateMenu.removeItem(object)
}
ExclusiveGroup
{
id: buildPlateGroup
//exclusiveGroup: group
}
//ExclusiveGroup { id: group }
}
MenuSeparator {}
MenuItem
UM.MenuItem
{
action: Cura.Actions.toggleFullScreen
}