From 0e1c9146cfa62209d09b71424bc8831e5f2a6ab6 Mon Sep 17 00:00:00 2001
From: ChrisTerBeke <c.terbeke@ultimaker.com>
Date: Wed, 6 Dec 2017 09:58:50 +0100
Subject: [PATCH] Implement stage model in top bar

---
 cura/CuraApplication.py          | 7 +++++--
 plugins/MonitorStage/__init__.py | 2 +-
 plugins/MonitorStage/plugin.json | 8 ++++++++
 plugins/PrepareStage/plugin.json | 8 ++++++++
 resources/qml/Topbar.qml         | 1 +
 5 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 plugins/MonitorStage/plugin.json
 create mode 100644 plugins/PrepareStage/plugin.json

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 5acaecbdd5..c83ed04c82 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -229,7 +229,9 @@ class CuraApplication(QtApplication):
             "TranslateTool",
             "FileLogger",
             "XmlMaterialProfile",
-            "PluginBrowser"
+            "PluginBrowser",
+            "PrepareStage",
+            "MonitorStage"
         ])
         self._physics = None
         self._volume = None
@@ -668,13 +670,14 @@ class CuraApplication(QtApplication):
 
         controller = self.getController()
 
+        controller.setActiveStage("PrepareStage")
         controller.setActiveView("SolidView")
         controller.setCameraTool("CameraTool")
         controller.setSelectionTool("SelectionTool")
 
         t = controller.getTool("TranslateTool")
         if t:
-            t.setEnabledAxis([ToolHandle.XAxis, ToolHandle.YAxis,ToolHandle.ZAxis])
+            t.setEnabledAxis([ToolHandle.XAxis, ToolHandle.YAxis, ToolHandle.ZAxis])
 
         Selection.selectionChanged.connect(self.onSelectionChanged)
 
diff --git a/plugins/MonitorStage/__init__.py b/plugins/MonitorStage/__init__.py
index c1f7cf0f6b..e18ecba7f9 100644
--- a/plugins/MonitorStage/__init__.py
+++ b/plugins/MonitorStage/__init__.py
@@ -10,7 +10,7 @@ def getMetaData():
     return {
         "stage": {
             "name": i18n_catalog.i18nc("@item:inmenu", "Monitor"),
-            "weight": 0,
+            "weight": 1,
             "icon": ""
         }
     }
diff --git a/plugins/MonitorStage/plugin.json b/plugins/MonitorStage/plugin.json
new file mode 100644
index 0000000000..cb3f55a80d
--- /dev/null
+++ b/plugins/MonitorStage/plugin.json
@@ -0,0 +1,8 @@
+{
+    "name": "Monitor Stage",
+    "author": "Ultimaker B.V.",
+    "version": "1.0.0",
+    "description": "Provides a monitor stage in Cura.",
+    "api": 4,
+    "i18n-catalog": "cura"
+}
\ No newline at end of file
diff --git a/plugins/PrepareStage/plugin.json b/plugins/PrepareStage/plugin.json
new file mode 100644
index 0000000000..4fd55e955e
--- /dev/null
+++ b/plugins/PrepareStage/plugin.json
@@ -0,0 +1,8 @@
+{
+    "name": "Prepare Stage",
+    "author": "Ultimaker B.V.",
+    "version": "1.0.0",
+    "description": "Provides a prepare stage in Cura.",
+    "api": 4,
+    "i18n-catalog": "cura"
+}
\ No newline at end of file
diff --git a/resources/qml/Topbar.qml b/resources/qml/Topbar.qml
index f2d053ce70..50e90a9a37 100644
--- a/resources/qml/Topbar.qml
+++ b/resources/qml/Topbar.qml
@@ -82,6 +82,7 @@ Rectangle
                 exclusiveGroup: sidebarHeaderBarGroup
                 style: UM.Theme.styles.topbar_header_tab
                 height: UM.Theme.getSize("sidebar_header").height
+                onClicked: UM.Controller.setActiveStage(model.id)
             }
         }