From c6d614156f1bd492147d9955f841074ae592f8c7 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Thu, 31 Aug 2017 16:09:16 +0200
Subject: [PATCH] Move the Cura logo into the top bar

Looks ugly there, I think, but the colours will be changed eventually so we'll see.

Contributes to issue CURA-4213.
---
 resources/qml/Cura.qml   | 22 ----------------------
 resources/qml/Topbar.qml | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 85b17e28a2..d4055f59f8 100755
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -353,28 +353,6 @@ UM.MainWindow
                 action: Cura.Actions.open;
             }
 
-            Image
-            {
-                id: logo
-                anchors
-                {
-                    left: parent.left
-                    leftMargin: UM.Theme.getSize("default_margin").width;
-                    bottom: parent.bottom
-                    bottomMargin: UM.Theme.getSize("default_margin").height;
-                }
-
-                source: UM.Theme.getImage("logo");
-                width: UM.Theme.getSize("logo").width;
-                height: UM.Theme.getSize("logo").height;
-                z: -1;
-
-                sourceSize.width: width;
-                sourceSize.height: height;
-            }
-
-
-
             Toolbar
             {
                 id: toolbar;
diff --git a/resources/qml/Topbar.qml b/resources/qml/Topbar.qml
index 210b9e1cfa..b66e29cf52 100644
--- a/resources/qml/Topbar.qml
+++ b/resources/qml/Topbar.qml
@@ -29,9 +29,25 @@ Rectangle
         name:"cura"
     }
 
+    Image
+    {
+        id: logo
+        anchors.left: parent.left
+        anchors.leftMargin: UM.Theme.getSize("default_margin").width
+        anchors.verticalCenter: parent.verticalCenter
+
+        source: UM.Theme.getImage("logo");
+        width: UM.Theme.getSize("logo").width;
+        height: UM.Theme.getSize("logo").height;
+
+        sourceSize.width: width;
+        sourceSize.height: height;
+    }
+
     Row
     {
-        anchors.left: parent.left
+        anchors.left: logo.right
+        anchors.leftMargin: UM.Theme.getSize("default_margin").width
         anchors.right: machineSelection.left
         anchors.rightMargin: UM.Theme.getSize("default_margin").width
         spacing: UM.Theme.getSize("default_margin").width