Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown

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

13 files changed, 49 insertions, 86 deletions

diff --git a/plugins/USBPrinting/AutoDetectBaudJob.py b/plugins/USBPrinting/AutoDetectBaudJob.py
index 6f1af6727a..78de864e57 100644
--- a/plugins/USBPrinting/AutoDetectBaudJob.py
+++ b/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
diff --git a/plugins/USBPrinting/plugin.json b/plugins/USBPrinting/plugin.json
index 3484c8a48a..5d3cba8415 100644
--- a/plugins/USBPrinting/plugin.json
+++ b/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"
diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json
index 678ea0a697..384b7d0412 100644
--- a/resources/bundled_packages/cura.json
+++ b/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": {
diff --git a/resources/definitions/alfawise_u20.def.json b/resources/definitions/alfawise_u20.def.json
index 87726fec3d..de8525fa4d 100644
--- a/resources/definitions/alfawise_u20.def.json
+++ b/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
         },
diff --git a/resources/definitions/jgaurora_a1.def.json b/resources/definitions/jgaurora_a1.def.json
index 4fd2eb4994..b9a921c311 100644
--- a/resources/definitions/jgaurora_a1.def.json
+++ b/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
         },
diff --git a/resources/definitions/jgaurora_a5.def.json b/resources/definitions/jgaurora_a5.def.json
index 02d9a9db4f..d84a8440e6 100644
--- a/resources/definitions/jgaurora_a5.def.json
+++ b/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
         },
diff --git a/resources/definitions/jgaurora_z_603s.def.json b/resources/definitions/jgaurora_z_603s.def.json
index 59e0ff129c..3a78585240 100644
--- a/resources/definitions/jgaurora_z_603s.def.json
+++ b/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
         },
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()
+            }
         }
     }
 
diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml
index 958a5f3d45..e1fd9cc389 100644
--- a/resources/qml/Preferences/SettingVisibilityPage.qml
+++ b/resources/qml/Preferences/SettingVisibilityPage.qml
@@ -115,15 +115,16 @@ UM.PreferencesPage
 
             currentIndex:
             {
+                var idx = -1;
                 for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i)
                 {
                     if(settingVisibilityPresetsModel.items[i].presetId == settingVisibilityPresetsModel.activePreset)
                     {
-                        currentIndex = i;
-                        return;
+                        idx = i;
+                        break;
                     }
                 }
-                return -1
+                return idx;
             }
 
             onActivated:
diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index e019714abe..1e335472d4 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -115,6 +115,7 @@ Item
             }
             radius: UM.Theme.getSize("default_radius").width
             color: UM.Theme.getColor("lining")
+            visible: extrudersModel.items.length > 1
         }
 
         Column
@@ -131,8 +132,7 @@ Item
                 id: extruders
                 width: childrenRect.width
                 height: childrenRect.height
-                property var _model: Cura.ExtrudersModel { id: extrudersModel }
-                model: _model.items.length > 1 ? _model : 0
+                model: extrudersModel.items.length > 1 ? extrudersModel : 0
 
                 delegate: ExtruderButton
                 {
@@ -144,13 +144,18 @@ Item
         }
     }
 
+    Cura.ExtrudersModel
+    {
+        id: extrudersModel
+    }
+
     UM.PointingRectangle
     {
-        id: panelBorder;
+        id: panelBorder
 
-        anchors.left: parent.right;
-        anchors.leftMargin: UM.Theme.getSize("default_margin").width;
-        anchors.top: base.top;
+        anchors.left: parent.right
+        anchors.leftMargin: UM.Theme.getSize("default_margin").width
+        anchors.top: base.top
         anchors.topMargin: base.activeY
         z: buttons.z - 1
 
@@ -161,14 +166,14 @@ Item
         {
             if (panel.item && panel.width > 0)
             {
-                 return Math.max(panel.width + 2 * UM.Theme.getSize("default_margin").width);
+                 return Math.max(panel.width + 2 * UM.Theme.getSize("default_margin").width)
             }
             else
             {
                 return 0;
             }
         }
-        height: panel.item ? panel.height + 2 * UM.Theme.getSize("default_margin").height : 0;
+        height: panel.item ? panel.height + 2 * UM.Theme.getSize("default_margin").height : 0
 
         opacity: panel.item && panel.width > 0 ? 1 : 0
         Behavior on opacity { NumberAnimation { duration: 100 } }
@@ -186,11 +191,11 @@ Item
         {
             id: panel
 
-            x: UM.Theme.getSize("default_margin").width;
-            y: UM.Theme.getSize("default_margin").height;
+            x: UM.Theme.getSize("default_margin").width
+            y: UM.Theme.getSize("default_margin").height
 
             source: UM.ActiveTool.valid ? UM.ActiveTool.activeToolPanel : ""
-            enabled: UM.Controller.toolsEnabled;
+            enabled: UM.Controller.toolsEnabled
         }
     }
 
diff --git a/resources/themes/cura-light/icons/info.svg b/resources/themes/cura-light/icons/info.svg
index 97e4fc4f35..9896b3dac8 100644
--- a/resources/themes/cura-light/icons/info.svg
+++ b/resources/themes/cura-light/icons/info.svg
@@ -1,48 +1,13 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 111.577 111.577" style="enable-background:new 0 0 111.577 111.577;" xml:space="preserve">
-<g>
-	<path d="M78.962,99.536l-1.559,6.373c-4.677,1.846-8.413,3.251-11.195,4.217c-2.785,0.969-6.021,1.451-9.708,1.451
-		c-5.662,0-10.066-1.387-13.207-4.142c-3.141-2.766-4.712-6.271-4.712-10.523c0-1.646,0.114-3.339,0.351-5.064
-		c0.239-1.727,0.619-3.672,1.139-5.846l5.845-20.688c0.52-1.981,0.962-3.858,1.316-5.633c0.359-1.764,0.532-3.387,0.532-4.848
-		c0-2.642-0.547-4.49-1.636-5.529c-1.089-1.036-3.167-1.562-6.252-1.562c-1.511,0-3.064,0.242-4.647,0.71
-		c-1.59,0.47-2.949,0.924-4.09,1.346l1.563-6.378c3.829-1.559,7.489-2.894,10.99-4.002c3.501-1.111,6.809-1.667,9.938-1.667
-		c5.623,0,9.962,1.359,13.009,4.077c3.047,2.72,4.57,6.246,4.57,10.591c0,0.899-0.1,2.483-0.315,4.747
-		c-0.21,2.269-0.601,4.348-1.171,6.239l-5.82,20.605c-0.477,1.655-0.906,3.547-1.279,5.676c-0.385,2.115-0.569,3.731-0.569,4.815
-		c0,2.736,0.61,4.604,1.833,5.597c1.232,0.993,3.354,1.487,6.368,1.487c1.415,0,3.025-0.251,4.814-0.744
-		C76.854,100.348,78.155,99.915,78.962,99.536z M80.438,13.03c0,3.59-1.353,6.656-4.072,9.177c-2.712,2.53-5.98,3.796-9.803,3.796
-		c-3.835,0-7.111-1.266-9.854-3.796c-2.738-2.522-4.11-5.587-4.11-9.177c0-3.583,1.372-6.654,4.11-9.207
-		C59.447,1.274,62.729,0,66.563,0c3.822,0,7.091,1.277,9.803,3.823C79.087,6.376,80.438,9.448,80.438,13.03z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
+    <title>Icon/ info</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Print-panel/-print" transform="translate(-214.000000, -24.000000)" fill="#08073F" fill-rule="nonzero">
+            <g id="Icon/-info" transform="translate(214.000000, 24.000000)">
+                <path d="M2.63588391,2.63588391 C-0.878627968,6.15039578 -0.878627968,11.8496042 2.63588391,15.3641161 C6.15039578,18.878628 11.8496042,18.878628 15.3641161,15.3641161 C18.878628,11.8496042 18.878628,6.15039578 15.3641161,2.63588391 C11.8496042,-0.878627968 6.15039578,-0.878627968 2.63588391,2.63588391 Z M9.01034483,3.5 C9.83793103,3.5 10.5,4.17808219 10.5,5 C10.5,5.82191781 9.81724138,6.5 9.01034483,6.5 C8.18275862,6.5 7.5,5.82191781 7.5,4.97945205 C7.5,4.15753425 8.18275862,3.5 9.01034483,3.5 Z M11.488168,13.3648649 C11.4474692,13.4783784 11.3660716,13.6108108 11.2846741,13.6864865 C10.75559,14.1972973 10.1044095,14.5 9.33113276,14.5 C8.96484376,14.5 8.61890416,14.5 8.25261516,14.4432432 C7.66248289,14.3675676 6.9095555,13.6864865 7.01130245,12.9675676 C7.0927,12.4756757 7.17409756,11.9837838 7.25549511,11.4918919 C7.41829022,10.6405405 7.58108533,9.77027027 7.74388044,8.91891892 C7.74388044,8.86216216 7.76422983,8.80540541 7.76422983,8.74864865 C7.76422983,8.38918919 7.6421335,8.25675676 7.25549511,8.21891892 C7.0927,8.2 6.92990489,8.18108108 6.76710978,8.14324324 C6.58396529,8.08648649 6.48221834,7.93513514 6.50256773,7.8027027 C6.52291712,7.65135135 6.62466406,7.55675676 6.82815795,7.51891892 C6.92990489,7.5 7.05200123,7.5 7.17409756,7.5 C7.62178411,7.5 8.06947066,7.5 8.5375066,7.5 C9.02589193,7.5 9.49392787,7.5 9.9823132,7.5 C10.3282528,7.5 10.5317467,7.65135135 10.5317467,7.97297297 C10.5317467,8.23783784 10.4910479,8.5027027 10.4299997,8.76756757 C10.2468553,9.75135135 10.0433614,10.7162162 9.86021687,11.7 C9.7991687,12.0216216 9.71777115,12.3432432 9.67707237,12.6648649 C9.65672298,12.8162162 9.67707237,12.9864865 9.71777115,13.1378378 C9.77881931,13.3459459 9.94161442,13.4594595 10.1654577,13.4405405 C10.3486022,13.4216216 10.5317467,13.3648649 10.7148912,13.2891892 C10.8573369,13.2324324 10.9794332,13.1378378 11.121879,13.1 C11.3660716,13.0243243 11.5492161,13.1567568 11.488168,13.3648649 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file