From 49ae0783966e388ca3af0d55853169bf201464c6 Mon Sep 17 00:00:00 2001
From: Aleksei S <a.sasin@ultimaker.com>
Date: Wed, 3 Jan 2018 16:45:26 +0100
Subject: [PATCH] Adjust 3d view and add Camera View to the menu bar CURA-4642

---
 resources/qml/Actions.qml        | 41 ++++++++++++++++++++++++++++----
 resources/qml/Menus/ViewMenu.qml | 10 +++++++-
 resources/qml/Topbar.qml         |  5 +---
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index aa185f8615..53900da4a7 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -17,7 +17,12 @@ Item
     property alias undo: undoAction;
     property alias redo: redoAction;
 
-    property alias homeCamera: homeCameraAction;
+    property alias view3DCamera: view3DCameraAction;
+    property alias viewFrontCamera: viewFrontCameraAction;
+    property alias viewTopCamera: viewTopCameraAction;
+    property alias viewLeftSideCamera: viewLeftSideCameraAction;
+    property alias viewRightSideCamera: viewRightSideCameraAction;
+
     property alias expandSidebar: expandSidebarAction;
 
     property alias deleteSelection: deleteSelectionAction;
@@ -104,9 +109,37 @@ Item
 
     Action
     {
-        id: homeCameraAction;
-        text: catalog.i18nc("@action:inmenu menubar:view","&Reset camera position");
-        onTriggered: CuraActions.homeCamera();
+        id: view3DCameraAction;
+        text: catalog.i18nc("@action:inmenu menubar:view","&3D View");
+        onTriggered: UM.Controller.rotateView("3d", 0);
+    }
+
+    Action
+    {
+        id: viewFrontCameraAction;
+        text: catalog.i18nc("@action:inmenu menubar:view","&Front View");
+        onTriggered: UM.Controller.rotateView("home", 0);
+    }
+
+    Action
+    {
+        id: viewTopCameraAction;
+        text: catalog.i18nc("@action:inmenu menubar:view","&Top View");
+        onTriggered: UM.Controller.rotateView("y", 90);
+    }
+
+    Action
+    {
+        id: viewLeftSideCameraAction;
+        text: catalog.i18nc("@action:inmenu menubar:view","&Left Side View");
+        onTriggered: UM.Controller.rotateView("x", 90);
+    }
+
+    Action
+    {
+        id: viewRightSideCameraAction;
+        text: catalog.i18nc("@action:inmenu menubar:view","&Right Side View");
+        onTriggered: UM.Controller.rotateView("x", -90);
     }
 
     Action
diff --git a/resources/qml/Menus/ViewMenu.qml b/resources/qml/Menus/ViewMenu.qml
index c8243ad2ed..eca8abd68f 100644
--- a/resources/qml/Menus/ViewMenu.qml
+++ b/resources/qml/Menus/ViewMenu.qml
@@ -31,6 +31,14 @@ 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; }
+    }
     MenuItem { action: Cura.Actions.expandSidebar; }
 }
diff --git a/resources/qml/Topbar.qml b/resources/qml/Topbar.qml
index bea0a7d2e3..e3dfb85c49 100644
--- a/resources/qml/Topbar.qml
+++ b/resources/qml/Topbar.qml
@@ -125,10 +125,7 @@ Rectangle
             iconSource: UM.Theme.getIcon("view_front")
             style: UM.Theme.styles.small_tool_button
             anchors.verticalCenter: viewOrientationControl.verticalCenter
-            onClicked: {
-                UM.Controller.rotateView("x", 0)
-                UM.Controller.rotateView("y", 0)
-            }
+            onClicked: UM.Controller.rotateView("home", 0);
             visible: base.width - allItemsWidth - 3 * this.width > 0
         }