Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown

Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.

3 files changed, 9 insertions, 5 deletions

diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml
index 8ce5d13f17..d1790b3791 100644
--- a/resources/qml/ActionPanel/OutputProcessWidget.qml
+++ b/resources/qml/ActionPanel/OutputProcessWidget.qml
@@ -112,6 +112,8 @@ Column
             id: previewStageShortcut
 
             height: UM.Theme.getSize("action_button").height
+            leftPadding: UM.Theme.getSize("default_margin").width
+            rightPadding: UM.Theme.getSize("default_margin").width
             text: catalog.i18nc("@button", "Preview")
 
             onClicked: UM.Controller.setActiveStage("PreviewStage")
diff --git a/resources/qml/ActionPanel/PrintInformationWidget.qml b/resources/qml/ActionPanel/PrintInformationWidget.qml
index 436649c4e1..554273a818 100644
--- a/resources/qml/ActionPanel/PrintInformationWidget.qml
+++ b/resources/qml/ActionPanel/PrintInformationWidget.qml
@@ -11,9 +11,6 @@ UM.RecolorImage
 {
     id: widget
 
-    //implicitHeight: UM.Theme.getSize("section_icon").height
-    //implicitWidth: UM.Theme.getSize("section_icon").width
-
     source: UM.Theme.getIcon("info")
     width: UM.Theme.getSize("section_icon").width
     height: UM.Theme.getSize("section_icon").height
diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml
index 1143bb4c1a..8f6608e15c 100644
--- a/resources/qml/ActionPanel/SliceProcessWidget.qml
+++ b/resources/qml/ActionPanel/SliceProcessWidget.qml
@@ -44,7 +44,7 @@ Column
     {
         id: autoSlicingLabel
         width: parent.width
-        visible: prepareButtons.autoSlice && widget.backendState == UM.Backend.Processing
+        visible: prepareButtons.autoSlice && (widget.backendState == UM.Backend.Processing || widget.backendState == UM.Backend.NotStarted)
 
         text: catalog.i18nc("@label:PrintjobStatus", "Auto slicing...")
         color: UM.Theme.getColor("text")
@@ -71,7 +71,8 @@ Column
         width: parent.width
         height: UM.Theme.getSize("progressbar").height
         value: progress
-        visible: widget.backendState == UM.Backend.Processing
+        indeterminate: widget.backendState == UM.Backend.NotStarted
+        visible: (widget.backendState == UM.Backend.Processing || (prepareButtons.autoSlice && widget.backendState == UM.Backend.NotStarted))
 
         background: Rectangle
         {
@@ -135,6 +136,10 @@ Column
         {
             var autoSlice = UM.Preferences.getValue("general/auto_slice")
             prepareButtons.autoSlice = autoSlice
+            if(autoSlice)
+            {
+                CuraApplication.backend.forceSlice()
+            }
         }
     }