From 122b6318feb590ee95a6da9f596ff38ab540fd86 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Mon, 13 Jan 2020 12:32:46 +0100
Subject: [PATCH 1/3] Remove dash if print job name is empty

Otherwise it shows ' - Ultimaker Cura' here which looks a bit weird.
---
 resources/qml/Cura.qml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 8dcf60018f..326edb6e97 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Ultimaker B.V.
+// Copyright (c) 2020 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.7
@@ -21,7 +21,16 @@ UM.MainWindow
     id: base
 
     // Cura application window title
-    title: PrintInformation.jobName + " - " + catalog.i18nc("@title:window", CuraApplication.applicationDisplayName)
+    title:
+    {
+        let result = "";
+        if(PrintInformation.jobName != "")
+        {
+            result += PrintInformation.jobName + " - ";
+        }
+        result += CuraApplication.applicationDisplayName;
+        return result;
+    }
 
     backgroundColor: UM.Theme.getColor("viewport_background")
 

From b6216896cbeee47799671418ccc6fb0c5753d9a7 Mon Sep 17 00:00:00 2001
From: Nino van Hooff <ninovanhooff@gmail.com>
Date: Mon, 13 Jan 2020 14:43:11 +0100
Subject: [PATCH 2/3] Add a script to execute the CI scripts on a local Docker
 instance

---
 test-in-docker.sh | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100755 test-in-docker.sh

diff --git a/test-in-docker.sh b/test-in-docker.sh
new file mode 100755
index 0000000000..e5a1116646
--- /dev/null
+++ b/test-in-docker.sh
@@ -0,0 +1,5 @@
+sudo rm -rf ./build ./Uranium
+sudo docker run -it --rm \
+  -v "$(pwd):/srv/cura" ultimaker/cura-build-environment \
+  /srv/cura/docker/build.sh
+sudo rm -rf ./build ./Uranium

From 3872e8ffa38622792285f47f38b20bc9a3e94e21 Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Tue, 14 Jan 2020 12:45:11 +0100
Subject: [PATCH 3/3] Move 'Toolbar' lower: Toolpanels could be obscured by
 objects-info.

---
 resources/qml/Cura.qml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 326edb6e97..d6f50f939b 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -253,23 +253,6 @@ UM.MainWindow
                 }
             }
 
-            Toolbar
-            {
-                // The toolbar is the left bar that is populated by all the tools (which are dynamicly populated by
-                // plugins)
-                id: toolbar
-
-                property int mouseX: base.mouseX
-                property int mouseY: base.mouseY
-
-                anchors
-                {
-                    verticalCenter: parent.verticalCenter
-                    left: parent.left
-                }
-                visible: CuraApplication.platformActivity && !PrintInformation.preSliced
-            }
-
             ObjectSelector
             {
                 id: objectSelector
@@ -311,6 +294,23 @@ UM.MainWindow
                 }
             }
 
+            Toolbar
+            {
+                // The toolbar is the left bar that is populated by all the tools (which are dynamicly populated by
+                // plugins)
+                id: toolbar
+
+                property int mouseX: base.mouseX
+                property int mouseY: base.mouseY
+
+                anchors
+                {
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                }
+                visible: CuraApplication.platformActivity && !PrintInformation.preSliced
+            }
+
             // A hint for the loaded content view. Overlay items / controls can safely be placed in this area
             Item {
                 id: mainSafeArea