Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown

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

plugins/USBPrinting/AutoDetectBaudJob.py

@@ -3,8 +3,8 @@
 
 from UM.Job import Job
 from UM.Logger import Logger
-from plugins.USBPrinting.avr_isp import ispBase
 
+from .avr_isp import ispBase
 from .avr_isp.stk500v2 import Stk500v2
 
 from time import time, sleep

plugins/USBPrinting/plugin.json

@@ -1,7 +1,7 @@
 {
     "name": "USB printing",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "api": 5,
     "description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.",
     "i18n-catalog": "cura"

resources/bundled_packages/cura.json

@@ -532,7 +532,7 @@
             "package_type": "plugin",
             "display_name": "USB Printing",
             "description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
             "sdk_version": 5,
             "website": "https://ultimaker.com",
             "author": {

resources/definitions/alfawise_u20.def.json

@@ -7,7 +7,7 @@
         "author": "Samuel Pinches",
         "manufacturer": "Alfawise",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fine",
+        "preferred_quality_type": "fast",
         "machine_extruder_trains":
         {
             "0": "alfawise_u20_extruder_0"
@@ -53,9 +53,6 @@
         "material_bed_temperature": {
             "default_value": 50
         },
-        "layer_height": {
-            "default_value": 0.15
-        },
         "layer_height_0": {
             "default_value": 0.2
         },

resources/definitions/jgaurora_a1.def.json

@@ -7,7 +7,7 @@
         "author": "Samuel Pinches",
         "manufacturer": "JGAurora",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fine",
+        "preferred_quality_type": "fast",
         "machine_extruder_trains":
         {
             "0": "jgaurora_a1_extruder_0"
@@ -53,9 +53,6 @@
         "material_bed_temperature": {
             "default_value": 67
         },
-        "layer_height": {
-            "default_value": 0.15
-        },
         "layer_height_0": {
             "default_value": 0.12
         },

resources/definitions/jgaurora_a5.def.json

@@ -9,7 +9,7 @@
         "file_formats": "text/x-gcode",
         "platform": "jgaurora_a5.stl",
         "platform_offset": [-242, -101, 273],
-        "preferred_quality_type": "fine",
+        "preferred_quality_type": "fast",
         "machine_extruder_trains":
         {
             "0": "jgaurora_a5_extruder_0"
@@ -55,9 +55,6 @@
         "material_bed_temperature": {
             "default_value": 67
         },
-        "layer_height": {
-            "default_value": 0.15
-        },
         "layer_height_0": {
             "default_value": 0.12
         },

resources/definitions/jgaurora_z_603s.def.json

@@ -7,7 +7,7 @@
         "author": "Samuel Pinches",
         "manufacturer": "JGAurora",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fine",
+        "preferred_quality_type": "fast",
         "machine_extruder_trains":
         {
             "0": "jgaurora_z_603s_extruder_0"
@@ -53,9 +53,6 @@
         "material_bed_temperature": {
             "default_value": 55
         },
-        "layer_height": {
-            "default_value": 0.15
-        },
         "layer_height_0": {
             "default_value": 0.2
         },

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")

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

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()
+            }
         }
     }