Merge branch '4.0'

resources/qml/ActionPanel/SliceProcessWidget.qml

@@ -107,7 +107,13 @@ Column
         {
             id: sliceButton
             fixedWidthMode: true
-            anchors.fill: parent
+
+            height: parent.height
+
+            anchors.right: additionalComponents.left
+            anchors.rightMargin: additionalComponents.width != 0 ? UM.Theme.getSize("default_margin").width : 0
+            anchors.left: parent.left
+
             text: catalog.i18nc("@button", "Slice")
             tooltip: catalog.i18nc("@label", "Start the slicing process")
             enabled: widget.backendState != UM.Backend.Error
@@ -119,12 +125,47 @@ Column
         {
             id: cancelButton
             fixedWidthMode: true
-            anchors.fill: parent
+            height: parent.height
+            anchors.left: parent.left
+
+            anchors.right: additionalComponents.left
+            anchors.rightMargin: additionalComponents.width != 0 ? UM.Theme.getSize("default_margin").width : 0
             text: catalog.i18nc("@button", "Cancel")
             enabled: sliceButton.enabled
             visible: !sliceButton.visible
             onClicked: sliceOrStopSlicing()
         }
+        Item
+        {
+            id: additionalComponents
+            width: childrenRect.width
+            anchors.right: parent.right
+            height: parent.height
+            Row
+            {
+                id: additionalComponentsRow
+                anchors.verticalCenter: parent.verticalCenter
+                spacing: UM.Theme.getSize("default_margin").width
+            }
+        }
+        Component.onCompleted: prepareButtons.addAdditionalComponents("saveButton")
+
+        Connections
+        {
+            target: CuraApplication
+            onAdditionalComponentsChanged: prepareButtons.addAdditionalComponents("saveButton")
+        }
+
+        function addAdditionalComponents (areaId)
+        {
+            if(areaId == "saveButton")
+            {
+                for (var component in CuraApplication.additionalComponents["saveButton"])
+                {
+                    CuraApplication.additionalComponents["saveButton"][component].parent = additionalComponentsRow
+                }
+            }
+        }
     }
 
 

resources/qml/MainWindow/ApplicationMenu.qml

@@ -83,14 +83,6 @@ Item
             }
         }
 
-        Menu
-        {
-            id: plugin_menu
-            title: catalog.i18nc("@title:menu menubar:toplevel", "&Marketplace")
-
-            MenuItem { action: Cura.Actions.browsePackages }
-        }
-
         Menu
         {
             id: preferencesMenu

resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml

@@ -187,7 +187,7 @@ Button
                 rightMargin: UM.Theme.getSize("wide_margin").width
             }
             height: childrenRect.height
-            visible: configuration.buildplateConfiguration != ""
+            visible: configuration.buildplateConfiguration != "" && false //Buildplate is disabled as long as we have no printers that properly support buildplate swapping (so we can't test).
 
             UM.RecolorImage
             {

resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml

@@ -51,7 +51,7 @@ Item
             anchors.left: icon.right
             anchors.right: parent.right
             anchors.leftMargin: UM.Theme.getSize("default_margin").width
-            text: catalog.i18nc("@label", "The configurations are not available because the printer is disconnected.")
+            text: catalog.i18nc("@label", "Downloading the configurations from the remote printer")
             color: UM.Theme.getColor("text")
             font: UM.Theme.getFont("default")
             renderType: Text.NativeRendering

resources/themes/cura-light/styles.qml

@@ -256,7 +256,7 @@ QtObject
                     source: control.iconSource
                     width: Theme.getSize("button_icon").width
                     height: Theme.getSize("button_icon").height
-                    color: Theme.getColor("toolbar_button_text")
+                    color: Theme.getColor("icon")
 
                     sourceSize: Theme.getSize("button_icon")
                 }

resources/themes/cura-light/theme.json

@@ -118,7 +118,6 @@
         "warning": [245, 166, 35, 255],
         "disabled": [229, 229, 229, 255],
 
-        "toolbar_button_text": [8, 7, 63, 255],
         "toolbar_button_hover": [232, 242, 252, 255],
         "toolbar_button_active": [232, 242, 252, 255],
         "toolbar_button_active_hover": [232, 242, 252, 255],