Merge branch '4.0' into CURA-6005_cura_drive_plugin

cura/CuraApplication.py

@@ -198,6 +198,8 @@ class CuraApplication(QtApplication):
         self._container_manager = None
 
         self._object_manager = None
+        self._extruders_model = None
+        self._extruders_model_with_optional = None
         self._build_plate_model = None
         self._multi_build_plate_model = None
         self._setting_visibility_presets_model = None
@@ -855,6 +857,19 @@ class CuraApplication(QtApplication):
             self._object_manager = ObjectsModel.createObjectsModel()
         return self._object_manager
 
+    @pyqtSlot(result = QObject)
+    def getExtrudersModel(self, *args) -> "ExtrudersModel":
+        if self._extruders_model is None:
+            self._extruders_model = ExtrudersModel(self)
+        return self._extruders_model
+
+    @pyqtSlot(result = QObject)
+    def getExtrudersModelWithOptional(self, *args) -> "ExtrudersModel":
+        if self._extruders_model_with_optional is None:
+            self._extruders_model_with_optional = ExtrudersModel(self)
+            self._extruders_model_with_optional.setAddOptionalExtruder(True)
+        return self._extruders_model_with_optional
+
     @pyqtSlot(result = QObject)
     def getMultiBuildPlateModel(self, *args) -> MultiBuildPlateModel:
         if self._multi_build_plate_model is None:

cura/Machines/Models/NozzleModel.py

@@ -33,8 +33,6 @@ class NozzleModel(ListModel):
     def _update(self):
         Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__))
 
-        self.items.clear()
-
         global_stack = self._machine_manager.activeMachine
         if global_stack is None:
             self.setItems([])

cura/Settings/ExtrudersModel.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot, pyqtProperty, QTimer
+from PyQt5.QtCore import Qt, pyqtSignal, pyqtProperty, QTimer
 from typing import Iterable
 
 from UM.i18n import i18nCatalog
@@ -78,8 +78,6 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
         self._update_extruder_timer.setSingleShot(True)
         self._update_extruder_timer.timeout.connect(self.__updateExtruders)
 
-        self._simple_names = False
-
         self._active_machine_extruders = []  # type: Iterable[ExtruderStack]
         self._add_optional_extruder = False
 
@@ -101,21 +99,6 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
     def addOptionalExtruder(self):
         return self._add_optional_extruder
 
-    ##  Set the simpleNames property.
-    def setSimpleNames(self, simple_names):
-        if simple_names != self._simple_names:
-            self._simple_names = simple_names
-            self.simpleNamesChanged.emit()
-            self._updateExtruders()
-
-    ##  Emitted when the simpleNames property changes.
-    simpleNamesChanged = pyqtSignal()
-
-    ##  Whether or not the model should show all definitions regardless of visibility.
-    @pyqtProperty(bool, fset = setSimpleNames, notify = simpleNamesChanged)
-    def simpleNames(self):
-        return self._simple_names
-
     ##  Links to the stack-changed signal of the new extruders when an extruder
     #   is swapped out or added in the current machine.
     #
@@ -221,7 +204,12 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
                     "enabled": True,
                     "color": "#ffffff",
                     "index": -1,
-                    "definition": ""
+                    "definition": "",
+                    "material": "",
+                    "variant": "",
+                    "stack": None,
+                    "material_brand": "",
+                    "color_name": "",
                 }
                 items.append(item)
             if self._items != items:

cura/Settings/MachineManager.py

@@ -88,12 +88,14 @@ class MachineManager(QObject):
 
         self._onGlobalContainerChanged()
 
-        ExtruderManager.getInstance().activeExtruderChanged.connect(self._onActiveExtruderStackChanged)
+        extruder_manager = self._application.getExtruderManager()
+
+        extruder_manager.activeExtruderChanged.connect(self._onActiveExtruderStackChanged)
         self._onActiveExtruderStackChanged()
 
-        ExtruderManager.getInstance().activeExtruderChanged.connect(self.activeMaterialChanged)
-        ExtruderManager.getInstance().activeExtruderChanged.connect(self.activeVariantChanged)
-        ExtruderManager.getInstance().activeExtruderChanged.connect(self.activeQualityChanged)
+        extruder_manager.activeExtruderChanged.connect(self.activeMaterialChanged)
+        extruder_manager.activeExtruderChanged.connect(self.activeVariantChanged)
+        extruder_manager.activeExtruderChanged.connect(self.activeQualityChanged)
 
         self.globalContainerChanged.connect(self.activeStackChanged)
         self.globalValueChanged.connect(self.activeStackValueChanged)

cura/Settings/SimpleModeSettingsManager.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2017 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty
+from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty, pyqtSlot
 
 from UM.Application import Application
 
@@ -16,12 +16,12 @@ class SimpleModeSettingsManager(QObject):
         self._is_profile_user_created = False  # True when profile was custom created by user
 
         self._machine_manager.activeStackValueChanged.connect(self._updateIsProfileCustomized)
-        self._machine_manager.activeQualityGroupChanged.connect(self._updateIsProfileUserCreated)
-        self._machine_manager.activeQualityChangesGroupChanged.connect(self._updateIsProfileUserCreated)
+        self._machine_manager.activeQualityGroupChanged.connect(self.updateIsProfileUserCreated)
+        self._machine_manager.activeQualityChangesGroupChanged.connect(self.updateIsProfileUserCreated)
 
         # update on create as the activeQualityChanged signal is emitted before this manager is created when Cura starts
         self._updateIsProfileCustomized()
-        self._updateIsProfileUserCreated()
+        self.updateIsProfileUserCreated()
 
     isProfileCustomizedChanged = pyqtSignal()
     isProfileUserCreatedChanged = pyqtSignal()
@@ -61,7 +61,8 @@ class SimpleModeSettingsManager(QObject):
     def isProfileUserCreated(self):
         return self._is_profile_user_created
 
-    def _updateIsProfileUserCreated(self):
+    @pyqtSlot()
+    def updateIsProfileUserCreated(self) -> None:
         quality_changes_keys = set()
 
         if not self._machine_manager.activeMachine:

cura/Stages/CuraStage.py

@@ -24,10 +24,6 @@ class CuraStage(Stage):
     def mainComponent(self) -> QUrl:
         return self.getDisplayComponent("main")
 
-    @pyqtProperty(QUrl, constant = True)
-    def sidebarComponent(self) -> QUrl:
-        return self.getDisplayComponent("sidebar")
-
     @pyqtProperty(QUrl, constant = True)
     def stageMenuComponent(self) -> QUrl:
         return self.getDisplayComponent("menu")

plugins/MachineSettingsAction/MachineSettingsAction.qml

@@ -13,7 +13,7 @@ import Cura 1.0 as Cura
 Cura.MachineAction
 {
     id: base
-    property var extrudersModel: Cura.ExtrudersModel{}
+    property var extrudersModel: CuraApplication.getExtrudersModel()
     property int extruderTabsCount: 0
 
     property var activeMachineId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.id : ""

plugins/MonitorStage/MonitorMain.qml

@@ -35,6 +35,6 @@ Item
         property real maximumWidth: parent.width
         property real maximumHeight: parent.height
 
-        sourceComponent: Cura.MachineManager.printerOutputDevices.length > 0 ? Cura.MachineManager.printerOutputDevices[0].monitorItem: null
+        sourceComponent: Cura.MachineManager.printerOutputDevices.length > 0 ? Cura.MachineManager.printerOutputDevices[0].monitorItem : null
     }
 }

plugins/PrepareStage/PrepareMenu.qml

@@ -100,7 +100,7 @@ Item
                     source: UM.Theme.getIcon("load")
                     width: UM.Theme.getSize("button_icon").width
                     height: UM.Theme.getSize("button_icon").height
-                    color: UM.Theme.getColor("toolbar_button_text")
+                    color: UM.Theme.getColor("icon")
 
                     sourceSize.height: height
                 }

plugins/PrepareStage/PrepareStage.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Ultimaker B.V.
+# Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 import os.path
 from UM.Application import Application
@@ -15,9 +15,5 @@ class PrepareStage(CuraStage):
         Application.getInstance().engineCreatedSignal.connect(self._engineCreated)
 
     def _engineCreated(self):
-        sidebar_component_path = os.path.join(Resources.getPath(Application.getInstance().ResourceTypes.QmlFiles),
-                                              "PrepareSidebar.qml")
-
         menu_component_path = os.path.join(PluginRegistry.getInstance().getPluginPath("PrepareStage"), "PrepareMenu.qml")
         self.addDisplayComponent("menu", menu_component_path)
-        self.addDisplayComponent("sidebar", sidebar_component_path)

plugins/SimulationView/SimulationViewMenuComponent.qml

@@ -163,7 +163,7 @@ Cura.ExpandableComponent
 
         Repeater
         {
-            model: Cura.ExtrudersModel{}
+            model: CuraApplication.getExtrudersModel()
 
             CheckBox
             {

plugins/SolidView/SolidView.py

@@ -12,7 +12,6 @@ from UM.Math.Color import Color
 from UM.View.GL.OpenGL import OpenGL
 
 from cura.Settings.ExtruderManager import ExtruderManager
-from cura.Settings.ExtrudersModel import ExtrudersModel
 
 import math
 
@@ -29,13 +28,16 @@ class SolidView(View):
         self._non_printing_shader = None
         self._support_mesh_shader = None
 
-        self._extruders_model = ExtrudersModel()
+        self._extruders_model = None
         self._theme = None
 
     def beginRendering(self):
         scene = self.getController().getScene()
         renderer = self.getRenderer()
 
+        if not self._extruders_model:
+            self._extruders_model = Application.getInstance().getExtrudersModel()
+
         if not self._theme:
             self._theme = Application.getInstance().getTheme()
 

plugins/Toolbox/resources/qml/RatingWidget.qml

@@ -0,0 +1,104 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.1
+import UM 1.0 as UM
+import Cura 1.1 as Cura
+Item
+{
+    id: ratingWidget
+
+    property real rating: 0
+    property int indexHovered: -1
+    property string packageId: ""
+
+    property int userRating: 0
+    property bool canRate: false
+
+    signal rated(int rating)
+
+    width: contentRow.width
+    height: contentRow.height
+    MouseArea
+    {
+        id: mouseArea
+        anchors.fill: parent
+        hoverEnabled: ratingWidget.canRate
+        acceptedButtons: Qt.NoButton
+        onExited:
+        {
+            if(ratingWidget.canRate)
+            {
+                ratingWidget.indexHovered = -1
+            }
+        }
+
+        Row
+        {
+            id: contentRow
+            height: childrenRect.height
+            Repeater
+            {
+                model: 5 // We need to get 5 stars
+                Button
+                {
+                    id: control
+                    hoverEnabled: true
+                    onHoveredChanged:
+                    {
+                        if(hovered && ratingWidget.canRate)
+                        {
+                            indexHovered = index
+                        }
+                    }
+
+                    ToolTip.visible: control.hovered  && !ratingWidget.canRate
+                    ToolTip.text: !Cura.API.account.isLoggedIn ? catalog.i18nc("@label", "You need to login first before you can rate"): catalog.i18nc("@label", "You need to install the package before you can rate")
+
+                    property bool isStarFilled:
+                    {
+                        // If the entire widget is hovered, override the actual rating.
+                        if(ratingWidget.indexHovered >= 0)
+                        {
+                            return indexHovered >= index
+                        }
+
+                        if(ratingWidget.userRating > 0)
+                        {
+                            return userRating >= index +1
+                        }
+
+                        return rating >= index + 1
+                    }
+
+                    contentItem: Item {}
+                    height: UM.Theme.getSize("rating_star").height
+                    width: UM.Theme.getSize("rating_star").width
+                    background: UM.RecolorImage
+                    {
+                        source: UM.Theme.getIcon(control.isStarFilled ? "star_filled" : "star_empty")
+
+                        // Unfilled stars should always have the default color. Only filled stars should change on hover
+                        color:
+                        {
+                            if(!ratingWidget.canRate)
+                            {
+                                return UM.Theme.getColor("rating_star")
+                            }
+                            if((ratingWidget.indexHovered >= 0 || ratingWidget.userRating > 0) && isStarFilled)
+                            {
+                                return UM.Theme.getColor("primary")
+                            }
+                            return UM.Theme.getColor("rating_star")
+                        }
+                    }
+                    onClicked:
+                    {
+                        if(ratingWidget.canRate)
+                        {
+                            rated(index + 1)  // Notify anyone who cares about this.
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

plugins/Toolbox/resources/qml/SmallRatingWidget.qml

@@ -0,0 +1,34 @@
+import QtQuick 2.3
+import QtQuick.Controls 1.4
+import UM 1.1 as UM
+import Cura 1.1 as Cura
+
+Row
+{
+    id: rating
+    height: UM.Theme.getSize("rating_star").height
+    visible: model.average_rating > 0 //Has a rating at all.
+    spacing: UM.Theme.getSize("thick_lining").width
+    width: starIcon.width + spacing + numRatingsLabel.width
+    UM.RecolorImage
+    {
+        id: starIcon
+        source: UM.Theme.getIcon("star_filled")
+        color: model.user_rating == 0  ? UM.Theme.getColor("rating_star") : UM.Theme.getColor("primary")
+        height: UM.Theme.getSize("rating_star").height
+        width: UM.Theme.getSize("rating_star").width
+    }
+
+    Label
+    {
+        id: numRatingsLabel
+        text: model.average_rating != undefined ? model.average_rating.toFixed(1) + " (" + model.num_ratings + " " + catalog.i18nc("@label", "ratings") + ")": ""
+        verticalAlignment: Text.AlignVCenter
+        height: starIcon.height
+        width: contentWidth
+        anchors.verticalCenter: starIcon.verticalCenter
+        color: starIcon.color
+        font: UM.Theme.getFont("small")
+        renderType: Text.NativeRendering
+    }
+}

plugins/Toolbox/resources/qml/ToolboxDetailPage.qml

@@ -6,6 +6,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import UM 1.1 as UM
 
+import Cura 1.1 as Cura
+
 Item
 {
     id: page
@@ -24,7 +26,7 @@ Item
             right: parent.right
             rightMargin: UM.Theme.getSize("wide_margin").width
         }
-        height: UM.Theme.getSize("toolbox_detail_header").height
+        height: childrenRect.height + 3 * UM.Theme.getSize("default_margin").width
         Rectangle
         {
             id: thumbnail
@@ -37,7 +39,7 @@ Item
                 leftMargin: UM.Theme.getSize("wide_margin").width
                 topMargin: UM.Theme.getSize("wide_margin").height
             }
-            color: "white" //Always a white background for image (regardless of theme).
+            color: UM.Theme.getColor("main_background")
             Image
             {
                 anchors.fill: parent
@@ -55,19 +57,23 @@ Item
                 top: thumbnail.top
                 left: thumbnail.right
                 leftMargin: UM.Theme.getSize("default_margin").width
-                right: parent.right
-                rightMargin: UM.Theme.getSize("wide_margin").width
-                bottomMargin: UM.Theme.getSize("default_margin").height
             }
             text: details === null ? "" : (details.name || "")
             font: UM.Theme.getFont("large")
             color: UM.Theme.getColor("text")
-            wrapMode: Text.WordWrap
-            width: parent.width
-            height: UM.Theme.getSize("toolbox_property_label").height
+            width: contentWidth
+            height: contentHeight
             renderType: Text.NativeRendering
         }
 
+        SmallRatingWidget
+        {
+            anchors.left: title.right
+            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.verticalCenter: title.verticalCenter
+            property var model: details
+        }
+
         Column
         {
             id: properties
@@ -81,6 +87,13 @@ Item
             width: childrenRect.width
             height: childrenRect.height
             Label
+            {
+                text: catalog.i18nc("@label", "Rating") + ":"
+                font: UM.Theme.getFont("default")
+                color: UM.Theme.getColor("text_medium")
+                renderType: Text.NativeRendering
+            }
+            Label
             {
                 text: catalog.i18nc("@label", "Version") + ":"
                 font: UM.Theme.getFont("default")
@@ -121,6 +134,48 @@ Item
             }
             spacing: Math.floor(UM.Theme.getSize("narrow_margin").height)
             height: childrenRect.height
+            RatingWidget
+            {
+                id: rating
+                visible: details.type == "plugin"
+                packageId: details.id != undefined ? details.id: ""
+                userRating: details.user_rating != undefined ? details.user_rating: 0
+                canRate: toolbox.isInstalled(details.id) && Cura.API.account.isLoggedIn
+
+                onRated:
+                {
+                    toolbox.ratePackage(details.id, rating)
+                    // HACK: This is a far from optimal solution, but without major refactoring, this is the best we can
+                    // do. Since a rework of this is scheduled, it shouldn't live that long...
+                    var index = toolbox.pluginsAvailableModel.find("id", details.id)
+                    if(index != -1)
+                    {
+                        if(details.user_rating == 0)  // User never rated before.
+                        {
+                            toolbox.pluginsAvailableModel.setProperty(index, "num_ratings", details.num_ratings + 1)
+                        }
+
+                        toolbox.pluginsAvailableModel.setProperty(index, "user_rating", rating)
+
+
+                        // Hack; This is because the current selection is an outdated copy, so we need to re-copy it.
+                        base.selection = toolbox.pluginsAvailableModel.getItem(index)
+                        return
+                    }
+                    index = toolbox.pluginsShowcaseModel.find("id", details.id)
+                    if(index != -1)
+                    {
+                        if(details.user_rating == 0) // User never rated before.
+                        {
+                            toolbox.pluginsShowcaseModel.setProperty(index, "user_rating", rating)
+                        }
+                        toolbox.pluginsShowcaseModel.setProperty(index, "num_ratings", details.num_ratings + 1)
+
+                        // Hack; This is because the current selection is an outdated copy, so we need to re-copy it.
+                        base.selection = toolbox.pluginsShowcaseModel.getItem(index)
+                    }
+                }
+            }
             Label
             {
                 text: details === null ? "" : (details.version || catalog.i18nc("@label", "Unknown"))
@@ -170,13 +225,6 @@ Item
                 renderType: Text.NativeRendering
             }
         }
-        Rectangle
-        {
-            color: UM.Theme.getColor("lining")
-            width: parent.width
-            height: UM.Theme.getSize("default_lining").height
-            anchors.bottom: parent.bottom
-        }
     }
     ToolboxDetailList
     {

plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml

@@ -6,6 +6,7 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import UM 1.1 as UM
+import Cura 1.1 as Cura
 
 Item
 {
@@ -14,94 +15,13 @@ Item
     property int installedPackages: (toolbox.viewCategory == "material" && model.type === undefined) ? toolbox.getNumberOfInstalledPackagesByAuthor(model.id) : (toolbox.isInstalled(model.id) ? 1 : 0)
     height: childrenRect.height
     Layout.alignment: Qt.AlignTop | Qt.AlignLeft
-    Rectangle
-    {
-        id: highlight
-        anchors.fill: parent
-        opacity: 0.0
-        color: UM.Theme.getColor("primary")
-    }
-    Row
-    {
-        width: parent.width
-        height: childrenRect.height
-        spacing: Math.floor(UM.Theme.getSize("narrow_margin").width)
-        Rectangle
-        {
-            id: thumbnail
-            width: UM.Theme.getSize("toolbox_thumbnail_small").width
-            height: UM.Theme.getSize("toolbox_thumbnail_small").height
-            color: "white"
-            border.width: UM.Theme.getSize("default_lining").width
-            border.color: UM.Theme.getColor("lining")
-            Image
-            {
-                anchors.centerIn: parent
-                width: UM.Theme.getSize("toolbox_thumbnail_small").width - UM.Theme.getSize("wide_margin").width
-                height: UM.Theme.getSize("toolbox_thumbnail_small").height - UM.Theme.getSize("wide_margin").width
-                fillMode: Image.PreserveAspectFit
-                source: model.icon_url || "../images/logobot.svg"
-                mipmap: true
-            }
-            UM.RecolorImage
-            {
-                width: (parent.width * 0.4) | 0
-                height: (parent.height * 0.4) | 0
-                anchors
-                {
-                    bottom: parent.bottom
-                    right: parent.right
-                }
-                sourceSize.height: height
-                visible: installedPackages != 0
-                color: (installedPackages == packageCount) ? UM.Theme.getColor("primary") : UM.Theme.getColor("border")
-                source: "../images/installed_check.svg"
-            }
-        }
-        Column
-        {
-            width: parent.width - thumbnail.width - parent.spacing
-            spacing: Math.floor(UM.Theme.getSize("narrow_margin").width)
-            anchors.top: parent.top
-            anchors.topMargin: UM.Theme.getSize("default_margin").height
-            Label
-            {
-                id: name
-                text: model.name
-                width: parent.width
-                wrapMode: Text.WordWrap
-                color: UM.Theme.getColor("text")
-                font: UM.Theme.getFont("default_bold")
-                renderType: Text.NativeRendering
-            }
-            Label
-            {
-                id: info
-                text: model.description
-                maximumLineCount: 2
-                elide: Text.ElideRight
-                width: parent.width
-                wrapMode: Text.WordWrap
-                color: UM.Theme.getColor("text_medium")
-                font: UM.Theme.getFont("default")
-                renderType: Text.NativeRendering
-            }
-        }
-    }
+
     MouseArea
     {
         anchors.fill: parent
         hoverEnabled: true
-        onEntered:
-        {
-            thumbnail.border.color = UM.Theme.getColor("primary")
-            highlight.opacity = 0.1
-        }
-        onExited:
-        {
-            thumbnail.border.color = UM.Theme.getColor("lining")
-            highlight.opacity = 0.0
-        }
+        onEntered: thumbnail.border.color = UM.Theme.getColor("primary")
+        onExited: thumbnail.border.color = UM.Theme.getColor("lining")
         onClicked:
         {
             base.selection = model
@@ -131,4 +51,83 @@ Item
             }
         }
     }
+
+    Rectangle
+    {
+        id: thumbnail
+        width: UM.Theme.getSize("toolbox_thumbnail_small").width
+        height: UM.Theme.getSize("toolbox_thumbnail_small").height
+        color: UM.Theme.getColor("main_background")
+        border.width: UM.Theme.getSize("default_lining").width
+        border.color: UM.Theme.getColor("lining")
+
+        Image
+        {
+            anchors.centerIn: parent
+            width: UM.Theme.getSize("toolbox_thumbnail_small").width - UM.Theme.getSize("wide_margin").width
+            height: UM.Theme.getSize("toolbox_thumbnail_small").height - UM.Theme.getSize("wide_margin").width
+            fillMode: Image.PreserveAspectFit
+            source: model.icon_url || "../images/logobot.svg"
+            mipmap: true
+        }
+        UM.RecolorImage
+        {
+            width: (parent.width * 0.4) | 0
+            height: (parent.height * 0.4) | 0
+            anchors
+            {
+                bottom: parent.bottom
+                right: parent.right
+            }
+            sourceSize.height: height
+            visible: installedPackages != 0
+            color: (installedPackages == packageCount) ? UM.Theme.getColor("primary") : UM.Theme.getColor("border")
+            source: "../images/installed_check.svg"
+        }
+    }
+    Item
+    {
+        anchors
+        {
+            left: thumbnail.right
+            leftMargin: Math.floor(UM.Theme.getSize("narrow_margin").width)
+            right: parent.right
+            top: parent.top
+            bottom: parent.bottom
+        }
+
+        Label
+        {
+            id: name
+            text: model.name
+            width: parent.width
+            elide: Text.ElideRight
+            color: UM.Theme.getColor("text")
+            font: UM.Theme.getFont("default_bold")
+        }
+        Label
+        {
+            id: info
+            text: model.description
+            elide: Text.ElideRight
+            width: parent.width
+            wrapMode: Text.WordWrap
+            color: UM.Theme.getColor("text_medium")
+            font: UM.Theme.getFont("default")
+            anchors.top: name.bottom
+            anchors.bottom: rating.top
+            verticalAlignment: Text.AlignVCenter
+            maximumLineCount: 2
+        }
+        SmallRatingWidget
+        {
+            id: rating
+            anchors
+            {
+                bottom: parent.bottom
+                left: parent.left
+                right: parent.right
+            }
+        }
+    }
 }

plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml

@@ -13,57 +13,25 @@ Rectangle
     property int installedPackages: toolbox.viewCategory == "material" ? toolbox.getNumberOfInstalledPackagesByAuthor(model.id) : (toolbox.isInstalled(model.id) ? 1 : 0)
     id: tileBase
     width: UM.Theme.getSize("toolbox_thumbnail_large").width + (2 * UM.Theme.getSize("default_lining").width)
-    height: thumbnail.height + packageNameBackground.height + (2 * UM.Theme.getSize("default_lining").width)
+    height: thumbnail.height + packageName.height + rating.height + UM.Theme.getSize("default_margin").width
     border.width: UM.Theme.getSize("default_lining").width
     border.color: UM.Theme.getColor("lining")
-    color: "transparent"
-    Rectangle
-    {
-        id: thumbnail
-        color: "white"
-        width: UM.Theme.getSize("toolbox_thumbnail_large").width
-        height: UM.Theme.getSize("toolbox_thumbnail_large").height
-        anchors
-        {
-            top: parent.top
-            horizontalCenter: parent.horizontalCenter
-            topMargin: UM.Theme.getSize("default_lining").width
-        }
+    color: UM.Theme.getColor("main_background")
     Image
     {
-            anchors.centerIn: parent
-            width: UM.Theme.getSize("toolbox_thumbnail_large").width - 2 * UM.Theme.getSize("default_margin").width
-            height: UM.Theme.getSize("toolbox_thumbnail_large").height - 2 * UM.Theme.getSize("default_margin").height
+        id: thumbnail
+        height: UM.Theme.getSize("toolbox_thumbnail_large").height - 4 * UM.Theme.getSize("default_margin").height
+        width: UM.Theme.getSize("toolbox_thumbnail_large").height - 4 * UM.Theme.getSize("default_margin").height
         fillMode: Image.PreserveAspectFit
         source: model.icon_url || "../images/logobot.svg"
         mipmap: true
-        }
-        UM.RecolorImage
-        {
-            width: (parent.width * 0.3) | 0
-            height: (parent.height * 0.3) | 0
         anchors
         {
-                bottom: parent.bottom
-                right: parent.right
-                bottomMargin: UM.Theme.getSize("default_lining").width
-            }
-            visible: installedPackages != 0
-            color: (installedPackages == packageCount) ? UM.Theme.getColor("primary") : UM.Theme.getColor("border")
-            source: "../images/installed_check.svg"
-        }
-    }
-    Rectangle
-    {
-        id: packageNameBackground
-        color: UM.Theme.getColor("primary")
-        anchors
-        {
-            top: thumbnail.bottom
+            top: parent.top
+            topMargin: UM.Theme.getSize("default_margin").height
             horizontalCenter: parent.horizontalCenter
         }
-        height: UM.Theme.getSize("toolbox_heading_label").height
-        width: parent.width
+    }
     Label
     {
         id: packageName
@@ -71,33 +39,52 @@ Rectangle
         anchors
         {
             horizontalCenter: parent.horizontalCenter
+            top: thumbnail.bottom
         }
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter
-            height: UM.Theme.getSize("toolbox_heading_label").height
-            width: parent.width
-            wrapMode: Text.WordWrap
-            color: UM.Theme.getColor("button_text")
-            font: UM.Theme.getFont("medium_bold")
         renderType: Text.NativeRendering
+        height: UM.Theme.getSize("toolbox_heading_label").height
+        width: parent.width - UM.Theme.getSize("default_margin").width
+        wrapMode: Text.WordWrap
+        font: UM.Theme.getFont("medium_bold")
     }
+    UM.RecolorImage
+    {
+        width: (parent.width * 0.20) | 0
+        height: width
+        anchors
+        {
+            bottom: bottomBorder.top
+            right: parent.right
         }
+        visible: installedPackages != 0
+        color: (installedPackages == packageCount) ? UM.Theme.getColor("primary") : UM.Theme.getColor("border")
+        source: "../images/installed_check.svg"
+    }
+
+    SmallRatingWidget
+    {
+        id: rating
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: UM.Theme.getSize("narrow_margin").height
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+    Rectangle
+    {
+        id: bottomBorder
+        color: UM.Theme.getColor("primary")
+        anchors.bottom: parent.bottom
+        width: parent.width
+        height: UM.Theme.getSize("toolbox_header_highlight").height
+    }
+
     MouseArea
     {
         anchors.fill: parent
         hoverEnabled: true
-        onEntered:
-        {
-            packageName.color = UM.Theme.getColor("button_text_hover")
-            packageNameBackground.color = UM.Theme.getColor("primary_hover")
-            tileBase.border.color = UM.Theme.getColor("primary_hover")
-        }
-        onExited:
-        {
-            packageName.color = UM.Theme.getColor("button_text")
-            packageNameBackground.color = UM.Theme.getColor("primary")
-            tileBase.border.color = UM.Theme.getColor("lining")
-        }
+        onEntered: tileBase.border.color = UM.Theme.getColor("primary")
+        onExited: tileBase.border.color = UM.Theme.getColor("lining")
         onClicked:
         {
             base.selection = model

plugins/Toolbox/src/PackagesModel.py

@@ -41,6 +41,9 @@ class PackagesModel(ListModel):
         self.addRoleName(Qt.UserRole + 20, "links")
         self.addRoleName(Qt.UserRole + 21, "website")
         self.addRoleName(Qt.UserRole + 22, "login_required")
+        self.addRoleName(Qt.UserRole + 23, "average_rating")
+        self.addRoleName(Qt.UserRole + 24, "num_ratings")
+        self.addRoleName(Qt.UserRole + 25, "user_rating")
 
         # List of filters for queries. The result is the union of the each list of results.
         self._filter = {}  # type: Dict[str, str]
@@ -101,7 +104,10 @@ class PackagesModel(ListModel):
                 "tags":                 package["tags"] if "tags" in package else [],
                 "links":                links_dict,
                 "website":              package["website"] if "website" in package else None,
-                "login_required":       "login-required" in package.get("tags", [])
+                "login_required":       "login-required" in package.get("tags", []),
+                "average_rating":       float(package.get("rating", {}).get("average", 0)),
+                "num_ratings":          package.get("rating", {}).get("count", 0),
+                "user_rating":          package.get("rating", {}).get("user_rating", 0)
             })
 
         # Filter on all the key-word arguments.

plugins/Toolbox/src/Toolbox.py

@@ -13,7 +13,6 @@ from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkRepl
 from UM.Logger import Logger
 from UM.PluginRegistry import PluginRegistry
 from UM.Extension import Extension
-from UM.Qt.ListModel import ListModel
 from UM.i18n import i18nCatalog
 from UM.Version import Version
 
@@ -51,17 +50,10 @@ class Toolbox(QObject, Extension):
         self._download_progress = 0  # type: float
         self._is_downloading = False  # type: bool
         self._network_manager = None  # type: Optional[QNetworkAccessManager]
-        self._request_header = [
-            b"User-Agent",
-            str.encode(
-                "%s/%s (%s %s)" % (
-                    self._application.getApplicationName(),
-                    self._application.getVersion(),
-                    platform.system(),
-                    platform.machine(),
-                )
-            )
-        ]
+        self._request_headers = [] # type: List[Tuple[bytes, bytes]]
+        self._updateRequestHeader()
+
+
         self._request_urls = {}  # type: Dict[str, QUrl]
         self._to_update = []  # type: List[str] # Package_ids that are waiting to be updated
         self._old_plugin_ids = set()  # type: Set[str]
@@ -116,6 +108,7 @@ class Toolbox(QObject, Extension):
         self._restart_dialog_message = ""  # type: str
 
         self._application.initializationFinished.connect(self._onAppInitialized)
+        self._application.getCuraAPI().account.loginStateChanged.connect(self._updateRequestHeader)
 
     # Signals:
     # --------------------------------------------------------------------------
@@ -135,12 +128,38 @@ class Toolbox(QObject, Extension):
     showLicenseDialog = pyqtSignal()
     uninstallVariablesChanged = pyqtSignal()
 
+    def _updateRequestHeader(self):
+        self._request_headers = [
+            (b"User-Agent",
+            str.encode(
+                "%s/%s (%s %s)" % (
+                    self._application.getApplicationName(),
+                    self._application.getVersion(),
+                    platform.system(),
+                    platform.machine(),
+                )
+            ))
+        ]
+        access_token = self._application.getCuraAPI().account.accessToken
+        if access_token:
+            self._request_headers.append((b"Authorization", "Bearer {}".format(access_token).encode()))
+
     def _resetUninstallVariables(self) -> None:
         self._package_id_to_uninstall = None  # type: Optional[str]
         self._package_name_to_uninstall = ""
         self._package_used_materials = []  # type: List[Tuple[GlobalStack, str, str]]
         self._package_used_qualities = []  # type: List[Tuple[GlobalStack, str, str]]
 
+    @pyqtSlot(str, int)
+    def ratePackage(self, package_id: str, rating: int) -> None:
+        url = QUrl("{base_url}/packages/{package_id}/ratings".format(base_url=self._api_url, package_id = package_id))
+
+        self._rate_request = QNetworkRequest(url)
+        for header_name, header_value in self._request_headers:
+            cast(QNetworkRequest, self._rate_request).setRawHeader(header_name, header_value)
+        data = "{\"data\": {\"cura_version\": \"%s\", \"rating\": %i}}" % (Version(self._application.getVersion()), rating)
+        self._rate_reply = cast(QNetworkAccessManager, self._network_manager).put(self._rate_request, data.encode())
+
     @pyqtSlot(result = str)
     def getLicenseDialogPluginName(self) -> str:
         return self._license_dialog_plugin_name
@@ -531,7 +550,8 @@ class Toolbox(QObject, Extension):
     def _makeRequestByType(self, request_type: str) -> None:
         Logger.log("i", "Requesting %s metadata from server.", request_type)
         request = QNetworkRequest(self._request_urls[request_type])
-        request.setRawHeader(*self._request_header)
+        for header_name, header_value in self._request_headers:
+            request.setRawHeader(header_name, header_value)
         if self._network_manager:
             self._network_manager.get(request)
 
@@ -546,7 +566,8 @@ class Toolbox(QObject, Extension):
         if hasattr(QNetworkRequest, "RedirectPolicyAttribute"):
             # Patch for Qt 5.9+
             cast(QNetworkRequest, self._download_request).setAttribute(QNetworkRequest.RedirectPolicyAttribute, True)
-        cast(QNetworkRequest, self._download_request).setRawHeader(*self._request_header)
+        for header_name, header_value in self._request_headers:
+            cast(QNetworkRequest, self._download_request).setRawHeader(header_name, header_value)
         self._download_reply = cast(QNetworkAccessManager, self._network_manager).get(self._download_request)
         self.setDownloadProgress(0)
         self.setIsDownloading(True)
@@ -628,7 +649,7 @@ class Toolbox(QObject, Extension):
                     else:
                         self.setViewPage("errored")
                         self.resetDownload()
-        else:
+        elif reply.operation() == QNetworkAccessManager.PutOperation:
             # Ignore any operation that is not a get operation
             pass
 

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml

@@ -97,6 +97,7 @@ Item
                         return ""
                     }
                     visible: printJob
+                    width: 120 * screenScaleFactor // TODO: Theme!
 
                     // FIXED-LINE-HEIGHT:
                     height: 18 * screenScaleFactor // TODO: Theme!

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml

@@ -12,7 +12,19 @@ import UM 1.2 as UM
 Item
 {
     // The printer name
-    property alias text: printerNameLabel.text;
+    property var text: ""
+    property var tagText: {
+        switch(text) {
+            case "Ultimaker 3":
+                return "UM 3"
+            case "Ultimaker 3 Extended":
+                return "UM 3 EXT"
+            case "Ultimaker S5":
+                return "UM S5"
+            default:
+                return text
+        }
+    }
 
     implicitHeight: 18 * screenScaleFactor // TODO: Theme!
     implicitWidth: printerNameLabel.contentWidth + 12 // TODO: Theme!
@@ -28,7 +40,7 @@ Item
         id: printerNameLabel
         anchors.centerIn: parent
         color: "#535369" // TODO: Theme!
-        text: ""
+        text: tagText
         font.pointSize: 10
     }
 }

plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml

@@ -34,16 +34,20 @@ Component
             name: "cura"
         }
 
-        LinearGradient {
+        LinearGradient
+        {
             anchors.fill: parent
-            gradient: Gradient {
-                GradientStop {
+            gradient: Gradient
+            {
+                GradientStop
+                {
                     position: 0.0
-                    color: "#f6f6f6"
+                    color: "#f6f6f6" // TODO: Theme!
                 }
-                GradientStop {
+                GradientStop
+                {
                     position: 1.0
-                    color: "#ffffff"
+                    color: "#ffffff" // TODO: Theme!
                 }
             }
         }
@@ -81,7 +85,8 @@ Component
             id: queue
             width: Math.min(834 * screenScaleFactor, maximumWidth)
 
-            anchors {
+            anchors
+            {
                 bottom: parent.bottom
                 horizontalCenter: parent.horizontalCenter
                 top: printers.bottom
@@ -210,7 +215,8 @@ Component
             ScrollView
             {
                 id: queuedPrintJobs
-                anchors {
+                anchors
+                {
                     bottom: parent.bottom
                     horizontalCenter: parent.horizontalCenter
                     top: printJobQueueHeadings.bottom
@@ -239,7 +245,8 @@ Component
             }
         }
 
-        PrinterVideoStream {
+        PrinterVideoStream
+        {
             anchors.fill: parent
             cameraUrl: OutputDevice.activeCameraUrl
             visible: OutputDevice.activeCameraUrl != ""

plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml

@@ -83,9 +83,7 @@ Item {
 
             Column {
                 Repeater {
-                    model: Cura.ExtrudersModel {
-                        simpleNames: true;
-                    }
+                    model: CuraApplication.getExtrudersModel()
 
                     Label {
                         text: model.name;

resources/definitions/fdmprinter.def.json

@@ -3385,7 +3385,7 @@
                 "retraction_combing":
                 {
                     "label": "Combing Mode",
-                    "description": "Combing keeps the nozzle within already printed areas when traveling. This results in slightly longer travel moves but reduces the need for retractions. If combing is off, the material will retract and the nozzle moves in a straight line to the next point. It is also possible to avoid combing over top/bottom skin areas and also to only comb within the infill. Note that the 'Within Infill' option behaves exactly like the 'Not in Skin' option in earlier Cura releases.",
+                    "description": "Combing keeps the nozzle within already printed areas when traveling. This results in slightly longer travel moves but reduces the need for retractions. If combing is off, the material will retract and the nozzle moves in a straight line to the next point. It is also possible to avoid combing over top/bottom skin areas or to only comb within the infill.",
                     "type": "enum",
                     "options":
                     {

resources/qml/ActionButton.qml

@@ -43,12 +43,13 @@ Button
 
     contentItem: Row
     {
+        spacing: UM.Theme.getSize("narrow_margin").width
         //Left side icon. Only displayed if !isIconOnRightSide.
         UM.RecolorImage
         {
             id: buttonIconLeft
             source: ""
-            height: buttonText.height
+            height: UM.Theme.getSize("action_button_icon").height
             width: visible ? height : 0
             sourceSize.width: width
             sourceSize.height: height
@@ -62,7 +63,7 @@ Button
             id: buttonText
             text: button.text
             color: button.enabled ? (button.hovered ? button.textHoverColor : button.textColor): button.textDisabledColor
-            font: UM.Theme.getFont("action_button")
+            font: UM.Theme.getFont("medium")
             visible: text != ""
             renderType: Text.NativeRendering
             anchors.verticalCenter: parent.verticalCenter
@@ -76,7 +77,7 @@ Button
         {
             id: buttonIconRight
             source: buttonIconLeft.source
-            height: buttonText.height
+            height: UM.Theme.getSize("action_button_icon").height
             width: visible ? height : 0
             sourceSize.width: width
             sourceSize.height: height

resources/qml/ActionPanel/OutputDevicesActionButton.qml

@@ -12,6 +12,12 @@ Item
 {
     id: widget
 
+    function requestWriteToDevice()
+    {
+        UM.OutputDeviceManager.requestWriteToDevice(UM.OutputDeviceManager.activeDevice, PrintInformation.jobName,
+            { "filter_by_machine": true, "preferred_mimetypes": Cura.MachineManager.activeMachine.preferred_output_file_formats });
+    }
+
     Cura.PrimaryButton
     {
         id: saveToButton
@@ -32,9 +38,8 @@ Item
 
         onClicked:
         {
-            forceActiveFocus();
-            UM.OutputDeviceManager.requestWriteToDevice(UM.OutputDeviceManager.activeDevice, PrintInformation.jobName,
-                { "filter_by_machine": true, "preferred_mimetypes": Cura.MachineManager.activeMachine.preferred_output_file_formats });
+            forceActiveFocus()
+            widget.requestWriteToDevice()
         }
     }
 
@@ -81,6 +86,7 @@ Item
                     delegate: Cura.ActionButton
                     {
                         text: model.description
+                        visible: model.id != UM.OutputDeviceManager.activeDevice  // Don't show the active device in the list
                         color: "transparent"
                         cornerRadius: 0
                         hoverColor: UM.Theme.getColor("primary")
@@ -88,6 +94,7 @@ Item
                         onClicked:
                         {
                             UM.OutputDeviceManager.setActiveDevice(model.id)
+                            widget.requestWriteToDevice()
                             popup.close()
                         }
                     }

resources/qml/ActionPanel/OutputProcessWidget.qml

@@ -41,7 +41,7 @@ Column
             {
                 left: parent.left
                 right: printInformationPanel.left
-                rightMargin: UM.Theme.getSize("thin_margin").height
+                rightMargin: printInformationPanel.visible ? UM.Theme.getSize("thin_margin").width : 0
             }
 
             Cura.IconWithText
@@ -119,9 +119,9 @@ Column
             }
 
             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")
+            tooltip: text
+            fixedWidthMode: true
 
             onClicked: UM.Controller.setActiveStage("PreviewStage")
             visible: UM.Controller.activeStage != null && UM.Controller.activeStage.stageId != "PreviewStage"

resources/qml/ActionPanel/PrintInformationWidget.qml

@@ -12,10 +12,10 @@ UM.RecolorImage
     id: widget
 
     source: UM.Theme.getIcon("info")
-    width: UM.Theme.getSize("section_icon").width
+    width: visible ? UM.Theme.getSize("section_icon").width : 0
     height: UM.Theme.getSize("section_icon").height
 
-    color: popup.opened ? UM.Theme.getColor("primary") : UM.Theme.getColor("text_medium")
+    color: UM.Theme.getColor("icon")
 
     MouseArea
     {

resources/qml/ActionPanel/SliceProcessWidget.qml

@@ -60,7 +60,7 @@ Column
 
         text: catalog.i18nc("@label:PrintjobStatus", "Unable to Slice")
         source: UM.Theme.getIcon("warning")
-        color: UM.Theme.getColor("warning")
+        iconColor: UM.Theme.getColor("warning")
     }
 
     // Progress bar, only visible when the backend is in the process of slice the printjob

resources/qml/Cura.qml

@@ -252,7 +252,7 @@ UM.MainWindow
                 anchors
                 {
                     // Align to the top of the stageMenu since the stageMenu may not exist
-                    top: parent.top
+                    top: stageMenu.source ? stageMenu.verticalCenter : parent.top
                     left: parent.left
                     right: parent.right
                     bottom: parent.bottom
@@ -278,6 +278,14 @@ UM.MainWindow
                 height: UM.Theme.getSize("stage_menu").height
                 source: UM.Controller.activeStage != null ? UM.Controller.activeStage.stageMenuComponent : ""
 
+                //  HACK: This is to ensure that the parent never gets set to null, as this wreaks havoc on the focus.
+                function onParentDestroyed()
+                {
+                    printSetupSelector.parent = stageMenu
+                    printSetupSelector.visible = false
+                }
+                property Item oldParent: null
+
                 // The printSetupSelector is defined here so that the setting list doesn't need to get re-instantiated
                 // Every time the stage is changed.
                 property var printSetupSelector: Cura.PrintSetupSelector
@@ -285,9 +293,18 @@ UM.MainWindow
                    width: UM.Theme.getSize("print_setup_widget").width
                    height: UM.Theme.getSize("stage_menu").height
                    headerCornerSide: RoundedRectangle.Direction.Right
+                   onParentChanged:
+                   {
+                       if(stageMenu.oldParent !=null)
+                       {
+                           stageMenu.oldParent.Component.destruction.disconnect(stageMenu.onParentDestroyed)
+                       }
+                       stageMenu.oldParent = parent
+                       visible = parent != stageMenu
+                       parent.Component.destruction.connect(stageMenu.onParentDestroyed)
+                   }
                 }
             }
-
             UM.MessageStack
             {
                 anchors

resources/qml/ExtruderIcon.qml

@@ -49,6 +49,7 @@ Item
             anchors.centerIn: parent
             text: index + 1
             font: UM.Theme.getFont("very_small")
+            color: UM.Theme.getColor("text")
             width: contentWidth
             height: contentHeight
             visible: extruderEnabled

resources/qml/IconWithText.qml

@@ -15,10 +15,10 @@ Item
 {
     property alias source: icon.source
     property alias iconSize: icon.width
+    property alias iconColor: icon.color
     property alias color: label.color
     property alias text: label.text
     property alias font: label.font
-
     property real margin: UM.Theme.getSize("narrow_margin").width
 
     // These properties can be used in combination with layouts.
@@ -37,9 +37,9 @@ Item
     {
         id: icon
         width: UM.Theme.getSize("section_icon").width
-        height: UM.Theme.getSize("section_icon").height
+        height: width
 
-        color: label.color
+        color: UM.Theme.getColor("icon")
 
         anchors
         {

resources/qml/MainWindow/MainWindowHeader.qml

@@ -54,16 +54,23 @@ Item
             {
                 text: model.name.toUpperCase()
                 checkable: true
-                checked: model.active
+                checked: UM.Controller.activeStage !== null && model.id == UM.Controller.activeStage.stageId
+
                 anchors.verticalCenter: parent.verticalCenter
                 exclusiveGroup: mainWindowHeaderMenuGroup
                 style: UM.Theme.styles.main_window_header_tab
                 height: UM.Theme.getSize("main_window_header_button").height
-                onClicked: UM.Controller.setActiveStage(model.id)
                 iconSource: model.stage.iconSource
 
                 property color overlayColor: "transparent"
                 property string overlayIconSource: ""
+
+                // This is a trick to assure the activeStage is correctly changed. It doesn't work propertly if done in the onClicked (see CURA-6028)
+                MouseArea
+                {
+                    anchors.fill: parent
+                    onClicked: UM.Controller.setActiveStage(model.id)
+                }
             }
         }
 

resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml

@@ -16,8 +16,8 @@ Item
     {
         id: header
         text: catalog.i18nc("@header", "Configurations")
-        font: UM.Theme.getFont("large")
-        color: UM.Theme.getColor("text")
+        font: UM.Theme.getFont("default")
+        color: UM.Theme.getColor("small_button_text")
         height: contentHeight
         renderType: Text.NativeRendering
 

resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml

@@ -14,21 +14,19 @@ Button
     property var configuration: null
     hoverEnabled: true
 
-    height: background.height
-
     background: Rectangle
     {
-        height: childrenRect.height
         color: parent.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
-        border.color: (parent.checked || parent.hovered) ? UM.Theme.getColor("primary") : UM.Theme.getColor("lining")
-        border.width: parent.checked ? UM.Theme.getSize("thick_lining").width : UM.Theme.getSize("default_lining").width
+        border.color: parent.checked ? UM.Theme.getColor("primary") : UM.Theme.getColor("lining")
+        border.width: UM.Theme.getSize("default_lining").width
         radius: UM.Theme.getSize("default_radius").width
+    }
 
-        Column
+    contentItem: Column
     {
         id: contentColumn
         width: parent.width
-            padding: UM.Theme.getSize("wide_margin").width
+        padding: UM.Theme.getSize("default_margin").width
         spacing: UM.Theme.getSize("narrow_margin").height
 
         Row
@@ -38,18 +36,16 @@ Button
             anchors
             {
                 left: parent.left
-                    leftMargin: parent.padding
+                leftMargin: UM.Theme.getSize("wide_margin").width
                 right: parent.right
-                    rightMargin: parent.padding
+                rightMargin: UM.Theme.getSize("wide_margin").width
             }
-                height: childrenRect.height
 
             spacing: UM.Theme.getSize("default_margin").width
 
             Repeater
             {
                 id: repeater
-                    height: childrenRect.height
                 model: configuration.extruderConfigurations
                 delegate: PrintCoreConfiguration
                 {
@@ -68,9 +64,9 @@ Button
             anchors
             {
                 left: parent.left
-                    leftMargin: parent.padding
+                leftMargin: UM.Theme.getSize("wide_margin").width
                 right: parent.right
-                    rightMargin: parent.padding
+                rightMargin: UM.Theme.getSize("wide_margin").width
             }
             height: visible ? Math.round(UM.Theme.getSize("default_lining").height / 2) : 0
             color: UM.Theme.getColor("lining")
@@ -83,9 +79,9 @@ Button
             anchors
             {
                 left: parent.left
-                    leftMargin: parent.padding
+                leftMargin: UM.Theme.getSize("wide_margin").width
                 right: parent.right
-                    rightMargin: parent.padding
+                rightMargin: UM.Theme.getSize("wide_margin").width
             }
             height: childrenRect.height
             visible: configuration.buildplateConfiguration != ""
@@ -105,7 +101,7 @@ Button
                 id: buildplateLabel
                 anchors.left: buildplateIcon.right
                 anchors.verticalCenter: buildplateIcon.verticalCenter
-                    anchors.leftMargin: Math.round(UM.Theme.getSize("default_margin").height / 2)
+                anchors.leftMargin: UM.Theme.getSize("narrow_margin").height
                 text: configuration.buildplateConfiguration
                 renderType: Text.NativeRendering
                 color: UM.Theme.getColor("text")
@@ -126,7 +122,6 @@ Button
     {
         configurationItem.checked = Cura.MachineManager.matchesConfiguration(configuration)
     }
-    }
 
     onClicked:
     {

resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml

@@ -7,16 +7,15 @@ import QtQuick.Controls 2.3
 import UM 1.2 as UM
 import Cura 1.0 as Cura
 
-Column
+Item
 {
     id: base
     property var outputDevice: null
-    height: childrenRect.height + 2 * padding
-    spacing: UM.Theme.getSize("narrow_margin").height
+    height: childrenRect.height
 
     function forceModelUpdate()
     {
-        // FIXME For now the model should be removed and then created again, otherwise changes in the printer don't automatically update the UI
+        // FIXME For now the model has to be removed and then created again, otherwise changes in the printer don't automatically update the UI
         configurationList.model = []
         if (outputDevice)
         {
@@ -24,6 +23,42 @@ Column
         }
     }
 
+    // This component will appear when there is no configurations (e.g. when losing connection)
+    Item
+    {
+        width: parent.width
+        visible: configurationList.model.length == 0
+        height: label.height + UM.Theme.getSize("wide_margin").height
+        anchors.top: parent.top
+        anchors.topMargin: UM.Theme.getSize("default_margin").height
+
+        UM.RecolorImage
+        {
+            id: icon
+
+            anchors.left: parent.left
+            anchors.verticalCenter: label.verticalCenter
+
+            source: UM.Theme.getIcon("warning")
+            color: UM.Theme.getColor("warning")
+            width: UM.Theme.getSize("section_icon").width
+            height: width
+        }
+
+        Label
+        {
+            id: label
+            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.")
+            color: UM.Theme.getColor("text")
+            font: UM.Theme.getFont("default")
+            renderType: Text.NativeRendering
+            wrapMode: Text.WordWrap
+        }
+    }
+
     ScrollView
     {
         id: container
@@ -57,7 +92,6 @@ Column
             id: configurationList
             spacing: UM.Theme.getSize("narrow_margin").height
             width: container.width - ((height > container.maximumHeight) ? container.ScrollBar.vertical.background.width : 0) //Make room for scroll bar if there is any.
-            contentHeight: childrenRect.height
             height: childrenRect.height
 
             section.property: "modelData.printerType"

resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml

@@ -17,10 +17,7 @@ Cura.ExpandablePopup
 {
     id: base
 
-    Cura.ExtrudersModel
-    {
-        id: extrudersModel
-    }
+    property var extrudersModel: CuraApplication.getExtrudersModel()
 
     UM.I18nCatalog
     {
@@ -34,6 +31,7 @@ Cura.ExpandablePopup
         Custom
     }
 
+    contentPadding: UM.Theme.getSize("default_lining").width
     enabled: Cura.MachineManager.hasMaterials || Cura.MachineManager.hasVariants || Cura.MachineManager.hasVariantBuildplates; //Only let it drop down if there is any configuration that you could change.
 
     headerItem: Item
@@ -127,34 +125,41 @@ Cura.ExpandablePopup
     contentItem: Column
     {
         id: popupItem
-        width: base.width - 2 * UM.Theme.getSize("default_margin").width
-        height: implicitHeight //Required because ExpandableComponent will try to use this to determine the size of the background of the pop-up.
+        width: UM.Theme.getSize("configuration_selector").width
+        height: implicitHeight  // Required because ExpandableComponent will try to use this to determine the size of the background of the pop-up.
+        padding: UM.Theme.getSize("default_margin").height
         spacing: UM.Theme.getSize("default_margin").height
 
-        property bool is_connected: false //If current machine is connected to a printer. Only evaluated upon making popup visible.
+        property bool is_connected: false  // If current machine is connected to a printer. Only evaluated upon making popup visible.
+        property int configuration_method: ConfigurationMenu.ConfigurationMethod.Custom  // Type of configuration being used. Only evaluated upon making popup visible.
+        property int manual_selected_method: -1  // It stores the configuration method selected by the user. By default the selected method is
+
         onVisibleChanged:
         {
-            is_connected = Cura.MachineManager.activeMachineNetworkKey !== "" && Cura.MachineManager.printerConnected //Re-evaluate.
-        }
+            is_connected = Cura.MachineManager.activeMachineNetworkKey !== "" && Cura.MachineManager.printerConnected  // Re-evaluate.
 
-        property int configuration_method: is_connected ? ConfigurationMenu.ConfigurationMethod.Auto : ConfigurationMenu.ConfigurationMethod.Custom //Auto if connected to a printer at start-up, or Custom if not.
+            // If the printer is not connected, we switch always to the custom mode. If is connected instead, the auto mode
+            // or the previous state is selected
+            configuration_method = is_connected ? (manual_selected_method == -1 ? ConfigurationMenu.ConfigurationMethod.Auto : manual_selected_method) : ConfigurationMenu.ConfigurationMethod.Custom
+        }
 
         Item
         {
-            width: parent.width
+            width: parent.width - 2 * parent.padding
             height:
             {
-                var height = 0;
-                if(autoConfiguration.visible)
+                var height = 0
+                if (autoConfiguration.visible)
                 {
-                    height += autoConfiguration.height;
+                    height += autoConfiguration.height
                 }
-                if(customConfiguration.visible)
+                if (customConfiguration.visible)
                 {
-                    height += customConfiguration.height;
+                    height += customConfiguration.height
                 }
-                return height;
+                return height
             }
+
             AutoConfiguration
             {
                 id: autoConfiguration
@@ -172,9 +177,9 @@ Cura.ExpandablePopup
         {
             id: separator
             visible: buttonBar.visible
-            x: -contentPadding
+            x: -parent.padding
 
-            width: base.width
+            width: parent.width
             height: UM.Theme.getSize("default_lining").height
 
             color: UM.Theme.getColor("lining")
@@ -186,7 +191,7 @@ Cura.ExpandablePopup
             id: buttonBar
             visible: popupItem.is_connected //Switching only makes sense if the "auto" part is possible.
 
-            width: parent.width
+            width: parent.width - 2 * parent.padding
             height: childrenRect.height
 
             Cura.SecondaryButton
@@ -200,7 +205,11 @@ Cura.ExpandablePopup
                 iconSource: UM.Theme.getIcon("arrow_right")
                 isIconOnRightSide: true
 
-                onClicked: popupItem.configuration_method = ConfigurationMenu.ConfigurationMethod.Custom
+                onClicked:
+                {
+                    popupItem.configuration_method = ConfigurationMenu.ConfigurationMethod.Custom
+                    popupItem.manual_selected_method = popupItem.configuration_method
+                }
             }
 
             Cura.SecondaryButton
@@ -211,8 +220,18 @@ Cura.ExpandablePopup
 
                 iconSource: UM.Theme.getIcon("arrow_left")
 
-                onClicked: popupItem.configuration_method = ConfigurationMenu.ConfigurationMethod.Auto
+                onClicked:
+                {
+                    popupItem.configuration_method = ConfigurationMenu.ConfigurationMethod.Auto
+                    popupItem.manual_selected_method = popupItem.configuration_method
                 }
             }
         }
+    }
+
+    Connections
+    {
+        target: Cura.MachineManager
+        onGlobalContainerChanged: popupItem.manual_selected_method = -1  // When switching printers, reset the value of the manual selected method
+    }
 }

resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml

@@ -23,8 +23,8 @@ Item
     {
         id: header
         text: catalog.i18nc("@header", "Custom")
-        font: UM.Theme.getFont("large")
-        color: UM.Theme.getColor("text")
+        font: UM.Theme.getFont("default")
+        color: UM.Theme.getColor("small_button_text")
         height: contentHeight
         renderType: Text.NativeRendering
 
@@ -51,9 +51,7 @@ Item
         anchors
         {
             left: parent.left
-            leftMargin: UM.Theme.getSize("default_margin").width
             right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width
             top: header.bottom
             topMargin: visible ? UM.Theme.getSize("default_margin").height : 0
         }
@@ -74,7 +72,7 @@ Item
             id: printerTypeSelector
             text: Cura.MachineManager.activeMachineDefinitionName
             tooltip: Cura.MachineManager.activeMachineDefinitionName
-            height: UM.Theme.getSize("setting_control").height
+            height: UM.Theme.getSize("print_setup_big_item").height
             width: Math.round(parent.width * 0.7) + UM.Theme.getSize("default_margin").width
             anchors.right: parent.right
             style: UM.Theme.styles.print_setup_header_button
@@ -224,7 +222,7 @@ Item
 
             Row
             {
-                height: UM.Theme.getSize("print_setup_item").height
+                height: UM.Theme.getSize("print_setup_big_item").height
                 visible: Cura.MachineManager.hasMaterials
 
                 Label
@@ -248,7 +246,7 @@ Item
                     text: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.material.name : ""
                     tooltip: text
 
-                    height: UM.Theme.getSize("setting_control").height
+                    height: UM.Theme.getSize("print_setup_big_item").height
                     width: selectors.controlWidth
 
                     style: UM.Theme.styles.print_setup_header_button
@@ -262,7 +260,7 @@ Item
 
             Row
             {
-                height: UM.Theme.getSize("print_setup_item").height
+                height: UM.Theme.getSize("print_setup_big_item").height
                 visible: Cura.MachineManager.hasVariants
 
                 Label
@@ -282,7 +280,7 @@ Item
                     text: Cura.MachineManager.activeVariantName
                     tooltip: Cura.MachineManager.activeVariantName
 
-                    height: UM.Theme.getSize("setting_control").height
+                    height: UM.Theme.getSize("print_setup_big_item").height
                     width: selectors.controlWidth
                     style: UM.Theme.styles.print_setup_header_button
                     activeFocusOnPress: true;

resources/qml/Menus/ContextMenu.qml

@@ -27,7 +27,7 @@ Menu
     MenuItem { id: extruderHeader; text: catalog.i18ncp("@label", "Print Selected Model With:", "Print Selected Models With:", UM.Selection.selectionCount); enabled: false; visible: base.shouldShowExtruders }
     Instantiator
     {
-        model: Cura.ExtrudersModel { id: extrudersModel }
+        model: CuraApplication.getExtrudersModel()
         MenuItem {
             text: "%1: %2 - %3".arg(model.name).arg(model.material).arg(model.variant)
             visible: base.shouldShowExtruders

resources/qml/MonitorSidebar.qml

@@ -1,212 +0,0 @@
-// Copyright (c) 2018 Ultimaker B.V.
-// Cura is released under the terms of the LGPLv3 or higher.
-
-import QtQuick 2.10
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.3
-
-import UM 1.2 as UM
-import Cura 1.0 as Cura
-
-import "Menus"
-import "Menus/ConfigurationMenu"
-
-
-Rectangle
-{
-    id: base
-
-    property int currentModeIndex
-    property bool hideSettings: PrintInformation.preSliced
-    property bool hideView: Cura.MachineManager.activeMachineName == ""
-
-    // Is there an output device for this printer?
-    property bool isNetworkPrinter: Cura.MachineManager.activeMachineNetworkKey != ""
-    property bool printerConnected: Cura.MachineManager.printerConnected
-    property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
-    property var connectedPrinter: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
-
-    property variant printDuration: PrintInformation.currentPrintTime
-    property variant printMaterialLengths: PrintInformation.materialLengths
-    property variant printMaterialWeights: PrintInformation.materialWeights
-    property variant printMaterialCosts: PrintInformation.materialCosts
-    property variant printMaterialNames: PrintInformation.materialNames
-
-    color: UM.Theme.getColor("main_background")
-    UM.I18nCatalog { id: catalog; name: "cura"}
-
-    Timer {
-        id: tooltipDelayTimer
-        interval: 500
-        repeat: false
-        property var item
-        property string text
-
-        onTriggered:
-        {
-            base.showTooltip(base, {x: 0, y: item.y}, text);
-        }
-    }
-
-    function showTooltip(item, position, text)
-    {
-        tooltip.text = text;
-        position = item.mapToItem(base, position.x - UM.Theme.getSize("default_arrow").width, position.y);
-        tooltip.show(position);
-    }
-
-    function hideTooltip()
-    {
-        tooltip.hide();
-    }
-
-    function strPadLeft(string, pad, length) {
-        return (new Array(length + 1).join(pad) + string).slice(-length);
-    }
-
-    function getPrettyTime(time)
-    {
-        var hours = Math.floor(time / 3600)
-        time -= hours * 3600
-        var minutes = Math.floor(time / 60);
-        time -= minutes * 60
-        var seconds = Math.floor(time);
-
-        var finalTime = strPadLeft(hours, "0", 2) + ":" + strPadLeft(minutes, "0", 2) + ":" + strPadLeft(seconds, "0", 2);
-        return finalTime;
-    }
-
-    MouseArea
-    {
-        anchors.fill: parent
-        acceptedButtons: Qt.AllButtons
-
-        onWheel:
-        {
-            wheel.accepted = true;
-        }
-    }
-
-    MachineSelector
-    {
-        id: machineSelection
-        width: base.width - configSelection.width - separator.width
-        height: UM.Theme.getSize("stage_menu").height
-        anchors.top: base.top
-        anchors.left: parent.left
-    }
-
-    Rectangle
-    {
-        id: separator
-        visible: configSelection.visible
-        width: visible ? Math.round(UM.Theme.getSize("thick_lining").height / 2) : 0
-        height: UM.Theme.getSize("stage_menu").height
-        color: UM.Theme.getColor("thick_lining")
-        anchors.left: machineSelection.right
-    }
-
-    CustomConfigurationSelector
-    {
-        id: configSelection
-        visible: isNetworkPrinter && printerConnected
-        width: visible ? Math.round(base.width * 0.15) : 0
-        height: UM.Theme.getSize("stage_menu").height
-        anchors.top: base.top
-        anchors.right: parent.right
-    }
-
-    Loader
-    {
-        id: controlItem
-        anchors.bottom: footerSeparator.top
-        anchors.top: machineSelection.bottom
-        anchors.left: base.left
-        anchors.right: base.right
-        sourceComponent:
-        {
-            if(connectedPrinter != null)
-            {
-                if(connectedPrinter.controlItem != null)
-                {
-                    return connectedPrinter.controlItem
-                }
-            }
-            return null
-        }
-    }
-
-    Loader
-    {
-        anchors.bottom: footerSeparator.top
-        anchors.top: machineSelection.bottom
-        anchors.left: base.left
-        anchors.right: base.right
-        source:
-        {
-            if(controlItem.sourceComponent == null)
-            {
-                return "PrintMonitor.qml"
-            }
-            else
-            {
-                return ""
-            }
-        }
-    }
-
-    Rectangle
-    {
-        id: footerSeparator
-        width: parent.width
-        height: UM.Theme.getSize("wide_lining").height
-        color: UM.Theme.getColor("wide_lining")
-        anchors.bottom: monitorButton.top
-        anchors.bottomMargin: UM.Theme.getSize("thick_margin").height
-    }
-
-    // MonitorButton is actually the bottom footer panel.
-    MonitorButton
-    {
-        id: monitorButton
-        implicitWidth: base.width
-        anchors.bottom: parent.bottom
-    }
-
-    PrintSetupTooltip
-    {
-        id: tooltip
-    }
-
-    UM.SettingPropertyProvider
-    {
-        id: machineExtruderCount
-
-        containerStack: Cura.MachineManager.activeMachine
-        key: "machine_extruder_count"
-        watchedProperties: [ "value" ]
-        storeIndex: 0
-    }
-
-    UM.SettingPropertyProvider
-    {
-        id: machineHeatedBed
-
-        containerStack: Cura.MachineManager.activeMachine
-        key: "machine_heated_bed"
-        watchedProperties: [ "value" ]
-        storeIndex: 0
-    }
-
-    // Make the ConfigurationSelector react when the global container changes, otherwise if Cura is not connected to the printer,
-    // switching printers make no reaction
-    Connections
-    {
-        target: Cura.MachineManager
-        onGlobalContainerChanged:
-        {
-            base.isNetworkPrinter = Cura.MachineManager.activeMachineNetworkKey != ""
-            base.printerConnected = Cura.MachineManager.printerOutputDevices.length != 0
-        }
-    }
-}

resources/qml/Preferences/ProfilesPage.qml

@@ -16,7 +16,7 @@ Item
 
     property QtObject qualityManager: CuraApplication.getQualityManager()
     property var resetEnabled: false  // Keep PreferencesDialog happy
-    property var extrudersModel: Cura.ExtrudersModel {}
+    property var extrudersModel: CuraApplication.getExtrudersModel()
 
     UM.I18nCatalog { id: catalog; name: "cura"; }
 

resources/qml/PrintMonitor.qml

@@ -60,11 +60,7 @@ Rectangle
 
         anchors.fill: parent
 
-        Cura.ExtrudersModel
-        {
-            id: extrudersModel
-            simpleNames: true
-        }
+        property var extrudersModel: CuraApplication.getExtrudersModel()
 
         OutputDeviceHeader
         {

resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml

@@ -16,10 +16,7 @@ Item
     property real padding: UM.Theme.getSize("default_margin").width
     property bool multipleExtruders: extrudersModel.count > 1
 
-    Cura.ExtrudersModel
-    {
-        id: extrudersModel
-    }
+    property var extrudersModel: CuraApplication.getExtrudersModel()
 
     // Profile selector row
     GlobalProfileSelector
@@ -113,9 +110,11 @@ Item
         }
         z: tabBar.z - 1
         // Don't show the border when only one extruder
+
         border.color: tabBar.visible ? UM.Theme.getColor("lining") : "transparent"
         border.width: UM.Theme.getSize("default_lining").width
 
+        color: UM.Theme.getColor("main_background")
         Cura.SettingView
         {
             anchors

resources/qml/PrintSetupSelector/PrintSetupSelector.qml

@@ -26,10 +26,7 @@ Cura.ExpandableComponent
 
     headerItem: PrintSetupSelectorHeader {}
 
-    Cura.ExtrudersModel
-    {
-        id: extrudersModel
-    }
+    property var extrudersModel: CuraApplication.getExtrudersModel()
 
     contentItem: PrintSetupSelectorContents {}
 }

resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml

@@ -144,6 +144,7 @@ Item
                             anchors.horizontalCenter: parent.horizontalCenter
                             y: UM.Theme.getSize("thin_margin").height
                             renderType: Text.NativeRendering
+                            color: UM.Theme.getColor("quality_slider_available")
                         }
                     }
                 }

resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml

@@ -39,6 +39,17 @@ Item
     {
         target: Cura.QualityProfilesDropDownMenuModel
         onItemsChanged: qualityModel.update()
+        onDataChanged:
+        {
+            // If a custom profile is selected and then a user decides to change any of setting the slider should show
+            // the reset button. After clicking the reset button the QualityProfilesDropDownMenuModel(ListModel) is
+            // updated before the property isProfileCustomized is called to update.
+            if (Cura.SimpleModeSettingsManager.isProfileCustomized)
+            {
+                Cura.SimpleModeSettingsManager.updateIsProfileUserCreated()
+            }
+            qualityModel.update()
+        }
     }
 
     Connections {

resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml

@@ -156,9 +156,10 @@ Item
     }
 
     //: Model used to populate the extrudelModel
-    Cura.ExtrudersModel
+    property var extruders: CuraApplication.getExtrudersModel()
+    Connections
     {
-        id: extruders
+        target: extruders
         onModelChanged: populateExtruderModel()
     }
 

resources/qml/PrinterOutput/ExtruderBox.qml

@@ -326,7 +326,7 @@ Item
                                 return UM.Theme.getColor("action_button_text");
                             }
                         }
-                        font: UM.Theme.getFont("action_button")
+                        font: UM.Theme.getFont("medium")
                         text:
                         {
                             if(extruderModel == null)

resources/qml/PrinterOutput/HeatedBedBox.qml

@@ -320,7 +320,7 @@ Item
                                 return UM.Theme.getColor("action_button_text");
                             }
                         }
-                        font: UM.Theme.getFont("action_button")
+                        font: UM.Theme.getFont("medium")
                         text:
                         {
                             if(printerModel == null)

resources/qml/PrinterOutput/MonitorSection.qml

@@ -27,7 +27,7 @@ Item
             anchors.left: parent.left
             anchors.leftMargin: UM.Theme.getSize("default_margin").width
             text: label
-            font: UM.Theme.getFont("setting_category")
+            font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("setting_category_text")
         }
     }

resources/qml/PrinterSelector/MachineSelector.qml

@@ -24,17 +24,9 @@ Cura.ExpandablePopup
         name: "cura"
     }
 
-    headerItem: Item
+    headerItem: Cura.IconWithText
     {
-        implicitHeight: icon.height
-
-        UM.RecolorImage
-        {
-            id: icon
-
-            anchors.left: parent.left
-            anchors.verticalCenter: parent.verticalCenter
-
+        text: isNetworkPrinter ? Cura.MachineManager.activeMachineNetworkGroupName : Cura.MachineManager.activeMachineName
         source:
         {
             if (isNetworkPrinter)
@@ -47,26 +39,9 @@ Cura.ExpandablePopup
             }
             return ""
         }
-            width: UM.Theme.getSize("machine_selector_icon").width
-            height: width
-
-            color: UM.Theme.getColor("machine_selector_printer_icon")
-            visible: source != ""
-        }
-
-        Label
-        {
-            id: label
-            anchors.left: icon.visible ? icon.right : parent.left
-            anchors.right: parent.right
-            anchors.leftMargin: UM.Theme.getSize("thin_margin").width
-            anchors.verticalCenter: icon.verticalCenter
-            text: isNetworkPrinter ? Cura.MachineManager.activeMachineNetworkGroupName : Cura.MachineManager.activeMachineName
-            elide: Text.ElideRight
-            color: UM.Theme.getColor("text")
         font: UM.Theme.getFont("medium")
-            renderType: Text.NativeRendering
-        }
+        iconColor: UM.Theme.getColor("machine_selector_printer_icon")
+        iconSize: source != "" ? UM.Theme.getSize("machine_selector_icon").width: 0
 
         UM.RecolorImage
         {

resources/qml/PrinterSelector/MachineSelectorButton.qml

@@ -42,7 +42,7 @@ Button
             }
             text: machineSelectorButton.text
             color: UM.Theme.getColor("text")
-            font: UM.Theme.getFont("action_button")
+            font: UM.Theme.getFont("medium")
             visible: text != ""
             renderType: Text.NativeRendering
             verticalAlignment: Text.AlignVCenter

resources/qml/Settings/SettingCategory.qml

@@ -73,7 +73,7 @@ Button
             text: definition.label
             textFormat: Text.PlainText
             renderType: Text.NativeRendering
-            font: UM.Theme.getFont("setting_category")
+            font: UM.Theme.getFont("default")
             color:
             {
                 if (!base.enabled)
@@ -106,26 +106,7 @@ Button
             width: UM.Theme.getSize("standard_arrow").width
             height: UM.Theme.getSize("standard_arrow").height
             sourceSize.height: width
-            color:
-            {
-                if (!base.enabled)
-                {
-                    return UM.Theme.getColor("setting_category_disabled_text")
-                }
-                else if ((base.hovered || base.activeFocus) && base.checkable && base.checked)
-                {
-                    return UM.Theme.getColor("setting_category_active_hover_text")
-                }
-                else if (base.pressed || (base.checkable && base.checked))
-                {
-                    return UM.Theme.getColor("setting_category_active_text")
-                }
-                else if (base.hovered || base.activeFocus)
-                {
-                    return UM.Theme.getColor("setting_category_hover_text")
-                }
-                return UM.Theme.getColor("setting_category_text")
-            }
+            color: UM.Theme.getColor("setting_control_button")
             source: base.checked ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
         }
     }

resources/qml/Settings/SettingComboBox.qml

@@ -63,7 +63,7 @@ SettingItem
             sourceSize.width: width + 5 * screenScaleFactor
             sourceSize.height: width + 5 * screenScaleFactor
 
-            color: UM.Theme.getColor("setting_control_text")
+            color: UM.Theme.getColor("setting_control_button")
         }
 
         contentItem: Label

resources/qml/Settings/SettingExtruder.qml

@@ -17,11 +17,16 @@ SettingItem
         id: control
         anchors.fill: parent
 
-        model: Cura.ExtrudersModel
+        property var extrudersModel: CuraApplication.getExtrudersModel()
+
+        model: extrudersModel
+
+        Connections
         {
+            target: extrudersModel
             onModelChanged:
             {
-                control.color = getItem(control.currentIndex).color
+                control.color = extrudersModel.getItem(control.currentIndex).color
             }
         }
 
@@ -105,7 +110,7 @@ SettingItem
             sourceSize.width: width + 5 * screenScaleFactor
             sourceSize.height: width + 5 * screenScaleFactor
 
-            color: UM.Theme.getColor("setting_control_text");
+            color: UM.Theme.getColor("setting_control_button");
         }
 
         background: Rectangle

resources/qml/Settings/SettingOptionalExtruder.qml

@@ -12,15 +12,24 @@ SettingItem
     id: base
     property var focusItem: control
 
+    // Somehow if we directory set control.model to CuraApplication.getExtrudersModelWithOptional()
+    // and in the Connections.onModelChanged use control.model as a reference, it will complain about
+    // non-existing properties such as "onModelChanged" and "getItem". I guess if we access the model
+    // via "control.model", it gives back a generic/abstract model instance. To avoid this, we add
+    // this extra property to keep the ExtrudersModel and use this in the rest of the code.
+    property var extrudersWithOptionalModel: CuraApplication.getExtrudersModelWithOptional()
+
     contents: ComboBox
     {
         id: control
         anchors.fill: parent
 
-        model: Cura.ExtrudersModel
+        model: base.extrudersWithOptionalModel
+
+        Connections
         {
-            onModelChanged: control.color = getItem(control.currentIndex).color
-            addOptionalExtruder: true
+            target: base.extrudersWithOptionalModel
+            onModelChanged: control.color = base.extrudersWithOptionalModel.getItem(control.currentIndex).color
         }
 
         textRole: "name"
@@ -102,7 +111,7 @@ SettingItem
             sourceSize.width: width + 5 * screenScaleFactor
             sourceSize.height: width + 5 * screenScaleFactor
 
-            color: UM.Theme.getColor("setting_control_text");
+            color: UM.Theme.getColor("setting_control_button");
         }
 
         background: Rectangle

resources/qml/Toolbar.qml

@@ -67,7 +67,7 @@ Item
                     toolItem: UM.RecolorImage
                     {
                         source: UM.Theme.getIcon(model.icon) != "" ? UM.Theme.getIcon(model.icon) : "file:///" + model.location + "/" + model.icon
-                        color: UM.Theme.getColor("toolbar_button_text")
+                        color: UM.Theme.getColor("icon")
 
                         sourceSize: UM.Theme.getSize("button_icon")
                     }
@@ -144,10 +144,7 @@ Item
         }
     }
 
-    Cura.ExtrudersModel
-    {
-        id: extrudersModel
-    }
+    property var extrudersModel: CuraApplication.getExtrudersModel()
 
     UM.PointingRectangle
     {

resources/qml/ViewOrientationButton.qml

@@ -11,5 +11,5 @@ UM.SimpleButton
     height: UM.Theme.getSize("small_button").height
     hoverColor: UM.Theme.getColor("small_button_text_hover")
     color: UM.Theme.getColor("small_button_text")
-    iconMargin: 0.5 * UM.Theme.getSize("wide_lining").width
+    iconMargin: UM.Theme.getSize("thick_lining").width
 }

resources/qml/ViewsSelector.qml

@@ -14,24 +14,28 @@ Cura.ExpandablePopup
     contentPadding: UM.Theme.getSize("default_lining").width
     contentAlignment: Cura.ExpandablePopup.ContentAlignment.AlignLeft
 
-    property var viewModel: UM.ViewModel { }
+    property var viewModel: UM.ViewModel
+    {
+        onDataChanged: updateActiveView()
+    }
 
-    property var activeView:
+    property var activeView: null
+
+    function updateActiveView()
     {
-        for (var i = 0; i < viewModel.count; i++)
+        for (var index in viewModel.items)
         {
-            if (viewModel.items[i].active)
+            if (viewModel.items[index].active)
             {
-                return viewModel.items[i]
+                activeView = viewModel.items[index]
+                return
             }
         }
-        return null
+        activeView = null
     }
 
     Component.onCompleted:
     {
-        // Nothing was active, so just return the first one (the list is sorted by priority, so the most
-        // important one should be returned)
         if (activeView == null)
         {
             UM.Controller.setActiveView(viewModel.getItem(0).id)
@@ -74,8 +78,6 @@ Cura.ExpandablePopup
     {
         id: viewSelectorPopup
         width: viewSelector.width - 2 * viewSelector.contentPadding
-        leftPadding: UM.Theme.getSize("default_lining").width
-        rightPadding: UM.Theme.getSize("default_lining").width
 
         // For some reason the height/width of the column gets set to 0 if this is not set...
         Component.onCompleted:
@@ -105,7 +107,7 @@ Cura.ExpandablePopup
                     id: buttonText
                     text: viewsSelectorButton.text
                     color: UM.Theme.getColor("text")
-                    font: UM.Theme.getFont("action_button")
+                    font: UM.Theme.getFont("medium")
                     renderType: Text.NativeRendering
                     verticalAlignment: Text.AlignVCenter
                     elide: Text.ElideRight

resources/themes/cura-dark/theme.json

@@ -17,6 +17,12 @@
         "border": [127, 127, 127, 255],
         "secondary": [95, 95, 95, 255],
 
+        "icon": [204, 204, 204, 255],
+        "toolbar_background": [39, 44, 48, 255],
+        "toolbar_button_active": [95, 95, 95, 255],
+        "toolbar_button_hover": [95, 95, 95, 255],
+        "toolbar_button_active_hover": [95, 95, 95, 255],
+
         "main_window_header_button_text_inactive": [128, 128, 128, 255],
         "main_window_header_button_text_hovered": [255, 255, 255, 255],
 
@@ -93,11 +99,11 @@
         "scrollbar_handle_hover": [255, 255, 255, 255],
         "scrollbar_handle_down": [255, 255, 255, 255],
 
-        "setting_category": [39, 44, 48, 255],
-        "setting_category_disabled": [39, 44, 48, 255],
-        "setting_category_hover": [39, 44, 48, 255],
-        "setting_category_active": [39, 44, 48, 255],
-        "setting_category_active_hover": [39, 44, 48, 255],
+        "setting_category": [75, 80, 83, 255],
+        "setting_category_disabled": [75, 80, 83, 255],
+        "setting_category_hover": [75, 80, 83, 255],
+        "setting_category_active": [75, 80, 83, 255],
+        "setting_category_active_hover": [75, 80, 83, 255],
         "setting_category_text": [255, 255, 255, 152],
         "setting_category_disabled_text": [255, 255, 255, 101],
         "setting_category_hover_text": [255, 255, 255, 204],

resources/themes/cura-light/icons/star_empty.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="13px" viewBox="0 0 14 13" 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>Star Copy 8</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Toolbox-VIP-material" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Marketplace-hover-" transform="translate(-140.000000, -457.000000)" stroke="#666666">
+            <path d="M150.450431,468.749111 L149.791458,464.907 L152.582915,462.186001 L148.725216,461.625444 L147,458.129776 L145.274784,461.625444 L141.417085,462.186001 L144.208542,464.907 L143.549569,468.749111 L147,466.935112 L150.450431,468.749111 Z" id="Star-Copy-8"></path>
+        </g>
+    </g>
+</svg>

resources/themes/cura-light/icons/star_filled.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="13px" viewBox="0 0 14 13" 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>Star Copy 7</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Toolbox-VIP-material" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Marketplace-hover-" transform="translate(-127.000000, -457.000000)" fill="#666666" stroke="#666666">
+            <path d="M137.450431,468.749111 L136.791458,464.907 L139.582915,462.186001 L135.725216,461.625444 L134,458.129776 L132.274784,461.625444 L128.417085,462.186001 L131.208542,464.907 L130.549569,468.749111 L134,466.935112 L137.450431,468.749111 Z" id="Star-Copy-7"></path>
+        </g>
+    </g>
+</svg>

resources/themes/cura-light/icons/warning.svg

@@ -1,4 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<svg width="20px" height="17px" viewBox="0 0 20 17" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <path d="M9.552 0C8.949 0 8.403 0.308 8.097 0.83L0.23 14.256C-0.076 14.78-0.077 15.415 0.23 15.937 0.573 16.522 1.146 16.769 1.751 16.767L17.354 16.767C17.959 16.769 18.531 16.522 18.875 15.937 19.182 15.415 19.181 14.78 18.875 14.256L11.008 0.83C10.702 0.308 10.156 0 9.552 0L9.552 0ZM9.552 1.397C9.636 1.397 9.762 1.471 9.8 1.536L17.667 14.962C17.704 15.027 17.704 15.16 17.667 15.224 17.665 15.227 17.437 15.37 17.354 15.37L1.751 15.37C1.668 15.37 1.44 15.227 1.438 15.224 1.4 15.16 1.4 15.027 1.438 14.962L9.305 1.536C9.343 1.471 9.469 1.397 9.552 1.397ZM9.552 5.356C8.909 5.356 8.388 5.877 8.388 6.521L8.621 10.479C8.621 10.994 9.038 11.411 9.552 11.411 10.067 11.411 10.484 10.994 10.484 10.479L10.717 6.521C10.717 5.877 10.195 5.356 9.552 5.356ZM9.552 11.877C8.781 11.877 8.155 12.502 8.155 13.274 8.155 14.046 8.781 14.671 9.552 14.671 10.324 14.671 10.95 14.046 10.95 13.274 10.95 12.502 10.324 11.877 9.552 11.877 Z" />
+<?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/warning-s</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Icon/warning-s" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icn/warning" transform="translate(0.000000, 1.000000)" fill="#000000" fill-rule="nonzero">
+            <path d="M10.2840021,13.2214915 L10.2840021,11.3934951 C10.2840021,11.3037916 10.252402,11.2286553 10.1892019,11.1680863 C10.1252018,11.1067505 10.0498017,11.0760827 9.96300155,11.0760827 L8.03699845,11.0760827 C7.94979832,11.0760827 7.87439819,11.1067505 7.81079809,11.1680863 C7.74759799,11.2286553 7.71599794,11.3037916 7.71599794,11.3934951 L7.71599794,13.2209164 C7.71599794,13.3106199 7.74759799,13.3859479 7.81079809,13.4469003 C7.87479819,13.5078527 7.95019832,13.5383288 8.03699845,13.5383288 L9.96300155,13.5383288 C10.0502017,13.5383288 10.1256018,13.507661 10.1892019,13.4463252 C10.252402,13.3857562 10.2840021,13.3106199 10.2840021,13.2209164 L10.2840021,13.2214915 Z M10.264202,9.62530099 L10.4448023,5.21142857 C10.4448023,5.13475891 10.4114023,5.07380653 10.3446022,5.02857143 C10.257402,4.95803534 10.1770019,4.9227673 10.1034018,4.9227673 L7.89659823,4.9227673 C7.82299811,4.9227673 7.74259798,4.95803534 7.65539784,5.02857143 C7.58859774,5.07342318 7.55519768,5.14089248 7.55519768,5.23097934 L7.72559796,9.62530099 C7.72559796,9.68932016 7.75919801,9.74222222 7.82639812,9.78400719 C7.89319822,9.82540881 7.97319835,9.84610961 8.0663985,9.84610961 L9.92280148,9.84610961 C10.0168016,9.84610961 10.0954018,9.82540881 10.1586019,9.78400719 C10.222602,9.74183887 10.257802,9.68893681 10.264202,9.62530099 Z M10.1238018,0.644025157 L17.8290142,14.182929 C18.0634145,14.5865948 18.0568145,14.9904522 17.8092141,15.3945013 C17.695614,15.5804253 17.5400137,15.7280144 17.3424134,15.8372686 C17.1452131,15.9457562 16.9330127,16 16.7058124,16 L1.29418764,16 C1.06698727,16 0.854786932,15.9455645 0.657586615,15.8366936 C0.459986298,15.7278227 0.304386049,15.5802336 0.190785866,15.3939263 C-0.056814531,14.9902606 -0.0634145416,14.5865948 0.170985835,14.182929 L7.8761982,0.644025157 C7.98979838,0.445450734 8.14699863,0.288277928 8.34779895,0.172506739 C8.54859928,0.0575022462 8.76599962,-1.42108547e-13 9,-1.42108547e-13 C9.23400038,-1.42108547e-13 9.45140072,0.0575022462 9.65220105,0.172506739 C9.85300137,0.288277928 10.0102016,0.445450734 10.1238018,0.644025157 Z" id="Shape"></path>
+        </g>
+    </g>
 </svg>

resources/themes/cura-light/styles.qml

@@ -75,7 +75,7 @@ QtObject
                     width: Theme.getSize("standard_arrow").width
                     height: Theme.getSize("standard_arrow").height
                     sourceSize.height: width
-                    color: control.enabled ? Theme.getColor("setting_category_text") : Theme.getColor("setting_category_disabled_text")
+                    color: control.enabled ? Theme.getColor("setting_control_button") : Theme.getColor("setting_category_disabled_text")
                     source: Theme.getIcon("arrow_bottom")
                 }
                 Label
@@ -392,7 +392,7 @@ QtObject
                     sourceSize.width: width + 5 * screenScaleFactor
                     sourceSize.height: width + 5 * screenScaleFactor
 
-                    color: Theme.getColor("setting_control_text");
+                    color: Theme.getColor("setting_control_button");
                 }
             }
         }
@@ -459,7 +459,7 @@ QtObject
                     sourceSize.width: width + 5 * screenScaleFactor
                     sourceSize.height: width + 5 * screenScaleFactor
 
-                    color: UM.Theme.getColor("setting_control_text")
+                    color: UM.Theme.getColor("setting_control_button")
                 }
             }
         }
@@ -662,7 +662,7 @@ QtObject
                             return UM.Theme.getColor("action_button_text");
                         }
                     }
-                    font: UM.Theme.getFont("action_button")
+                    font: UM.Theme.getFont("medium")
                     text: control.text
                 }
             }

resources/themes/cura-light/theme.json

@@ -49,21 +49,6 @@
             "size": 0.7,
             "weight": 50,
             "family": "Noto Sans"
-        },
-        "button_tooltip": {
-            "size": 1.0,
-            "weight": 50,
-            "family": "Noto Sans"
-        },
-        "setting_category": {
-            "size": 1.15,
-            "weight": 63,
-            "family": "Noto Sans"
-        },
-        "action_button": {
-            "size": 1.15,
-            "weight": 50,
-            "family": "Noto Sans"
         }
     },
 
@@ -83,6 +68,8 @@
         "secondary": [240, 240, 240, 255],
         "secondary_shadow": [216, 216, 216, 255],
 
+        "icon": [8, 7, 63, 255],
+
         "primary_button": [38, 113, 231, 255],
         "primary_button_shadow": [27, 95, 202, 255],
         "primary_button_hover": [81, 145, 247, 255],
@@ -116,7 +103,7 @@
 
         "printer_type_label_background": [228, 228, 242, 255],
 
-        "text": [0, 0, 0, 255],
+        "text": [25, 25, 25, 255],
         "text_detail": [174, 174, 174, 128],
         "text_link": [50, 130, 255, 255],
         "text_inactive": [174, 174, 174, 255],
@@ -160,6 +147,8 @@
 
         "extruder_button_material_border": [255, 255, 255, 255],
 
+        "rating_star": [90, 90, 90, 255],
+
         "sync_button_text": [120, 120, 120, 255],
         "sync_button_text_hovered": [0, 0, 0, 255],
 
@@ -255,8 +244,8 @@
         "message_button_text": [255, 255, 255, 255],
         "message_button_text_hover": [255, 255, 255, 255],
         "message_button_text_active": [255, 255, 255, 255],
-        "message_progressbar_background": [200, 200, 200, 255],
-        "message_progressbar_control": [77, 182, 226, 255],
+        "message_progressbar_background": [245, 245, 245, 255],
+        "message_progressbar_control": [50, 130, 255, 255],
 
         "tool_panel_background": [255, 255, 255, 255],
 
@@ -347,7 +336,7 @@
     },
 
     "sizes": {
-        "window_minimum_size": [106, 66],
+        "window_minimum_size": [100, 60],
 
         "main_window_header": [0.0, 4.0],
         "main_window_header_button": [8, 2.35],
@@ -369,9 +358,10 @@
 
         "expandable_component_content_header": [0.0, 3.0],
 
+        "configuration_selector": [35.0, 4.0],
         "configuration_selector_mode_tabs": [0.0, 3.0],
 
-        "action_panel_widget": [25.0, 0.0],
+        "action_panel_widget": [26.0, 0.0],
         "action_panel_information_widget": [20.0, 0.0],
 
         "machine_selector_widget": [20.0, 4.0],
@@ -402,6 +392,7 @@
         "section": [0.0, 2],
         "section_icon": [1.6, 1.6],
         "section_icon_column": [2.8, 0.0],
+        "rating_star": [1.0, 1.0],
 
         "setting": [25.0, 1.8],
         "setting_control": [11.0, 2.0],
@@ -420,6 +411,7 @@
         "button_lining": [0, 0],
 
         "action_button": [15.0, 3.0],
+        "action_button_icon": [1.0, 1.0],
         "action_button_radius": [0.15, 0.15],
 
         "small_button": [2, 2],