Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header

resources/qml/Actions.qml

@@ -58,7 +58,6 @@ Item
 
     property alias preferences: preferencesAction;
 
-    property alias showEngineLog: showEngineLogAction;
     property alias showProfileFolder: showProfileFolderAction;
     property alias documentation: documentationAction;
     property alias reportBug: reportBugAction;
@@ -396,14 +395,6 @@ Item
         shortcut: StandardKey.New
     }
 
-    Action
-    {
-        id: showEngineLogAction;
-        text: catalog.i18nc("@action:inmenu menubar:help","Show Engine &Log...");
-        iconName: "view-list-text";
-        shortcut: StandardKey.WhatsThis;
-    }
-
     Action
     {
         id: showProfileFolderAction;

resources/qml/Cura.qml

@@ -13,6 +13,7 @@ import Cura 1.1 as Cura
 import "Dialogs"
 import "Menus"
 import "Skeleton"
+import "components"
 
 UM.MainWindow
 {
@@ -197,7 +198,7 @@ UM.MainWindow
             {
                 id: applicationViews
 
-                visible: UM.Controller.activeStage.stageId != "MonitorStage"
+
                 anchors
                 {
                     top: parent.top
@@ -311,6 +312,20 @@ UM.MainWindow
                     bottomMargin:  UM.Theme.getSize("default_margin").height
                 }
             }
+
+
+            ViewOrientationControls
+            {
+                id: viewOrientationControls
+
+                anchors
+                {
+                    left: parent.left
+                    margins: UM.Theme.getSize("default_margin").width
+
+                    bottom: parent.bottom
+                }
+            }
         }
     }
 
@@ -655,11 +670,6 @@ UM.MainWindow
         }
     }
 
-    EngineLog
-    {
-        id: engineLog;
-    }
-
     Connections
     {
         target: Cura.Actions.showProfileFolder

resources/qml/EngineLog.qml

@@ -1,53 +0,0 @@
-// Copyright (c) 2015 Ultimaker B.V.
-// Cura is released under the terms of the LGPLv3 or higher.
-
-import QtQuick 2.2
-import QtQuick.Controls 1.1
-import QtQuick.Layouts 1.1
-
-import UM 1.1 as UM
-
-UM.Dialog
-{
-    id: dialog;
-
-    //: Engine Log dialog title
-    title: catalog.i18nc("@title:window","Engine Log");
-
-    modality: Qt.NonModal;
-
-    TextArea
-    {
-        id: textArea
-        anchors.fill: parent;
-
-        Timer
-        {
-            id: updateTimer;
-            interval: 1000;
-            running: false;
-            repeat: true;
-            onTriggered: textArea.text = CuraApplication.getEngineLog();
-        }
-        UM.I18nCatalog{id: catalog; name:"cura"}
-    }
-
-    rightButtons: Button
-    {
-        //: Close engine log button
-        text: catalog.i18nc("@action:button","Close");
-        onClicked: dialog.visible = false;
-    }
-
-    onVisibleChanged:
-    {
-        if(visible)
-        {
-            textArea.text = CuraApplication.getEngineLog();
-            updateTimer.start();
-        } else
-        {
-            updateTimer.stop();
-        }
-    }
-}

resources/qml/Skeleton/ApplicationViews.qml

@@ -20,16 +20,6 @@ Item
 
     height: UM.Theme.getSize("views_selector").height
 
-    OrientationViews
-    {
-        id: orientationViews
-
-        anchors {
-            verticalCenter: parent.verticalCenter
-            right: viewModeButton.left
-            rightMargin: UM.Theme.getSize("default_margin").width
-        }
-    }
 
     ComboBox
     {

resources/qml/components/ViewOrientationControls.qml

@@ -13,7 +13,8 @@ Row
     id: viewOrientationControl
 
     spacing: 2 * screenScaleFactor
-
+    height: childrenRect.height
+    width: childrenRect.width
     // #1 3d view
     Button
     {