Merge remote-tracking branch 'origin/master' into ui_rework_4_0

cura/Machines/Models/QualityProfilesDropDownMenuModel.py

@@ -21,6 +21,7 @@ class QualityProfilesDropDownMenuModel(ListModel):
     AvailableRole = Qt.UserRole + 5
     QualityGroupRole = Qt.UserRole + 6
     QualityChangesGroupRole = Qt.UserRole + 7
+    IsExperimentalRole = Qt.UserRole + 8
 
     def __init__(self, parent = None):
         super().__init__(parent)
@@ -32,6 +33,7 @@ class QualityProfilesDropDownMenuModel(ListModel):
         self.addRoleName(self.AvailableRole, "available") #Whether the quality profile is available in our current nozzle + material.
         self.addRoleName(self.QualityGroupRole, "quality_group")
         self.addRoleName(self.QualityChangesGroupRole, "quality_changes_group")
+        self.addRoleName(self.IsExperimentalRole, "is_experimental")
 
         self._application = Application.getInstance()
         self._machine_manager = self._application.getMachineManager()
@@ -74,7 +76,8 @@ class QualityProfilesDropDownMenuModel(ListModel):
                     "layer_height": layer_height,
                     "layer_height_unit": self._layer_height_unit,
                     "available": quality_group.is_available,
-                    "quality_group": quality_group}
+                    "quality_group": quality_group,
+                    "is_experimental": quality_group.is_experimental}
 
             item_list.append(item)
 

cura/Machines/QualityGroup.py

@@ -4,6 +4,9 @@
 from typing import Dict, Optional, List, Set
 
 from PyQt5.QtCore import QObject, pyqtSlot
+
+from UM.Util import parseBool
+
 from cura.Machines.ContainerNode import ContainerNode
 
 
@@ -29,6 +32,7 @@ class QualityGroup(QObject):
         self.nodes_for_extruders = {}  # type: Dict[int, ContainerNode]
         self.quality_type = quality_type
         self.is_available = False
+        self.is_experimental = False
 
     @pyqtSlot(result = str)
     def getName(self) -> str:
@@ -51,3 +55,17 @@ class QualityGroup(QObject):
         for extruder_node in self.nodes_for_extruders.values():
             result.append(extruder_node)
         return result
+
+    def setGlobalNode(self, node: "ContainerNode") -> None:
+        self.node_for_global = node
+
+        # Update is_experimental flag
+        is_experimental = parseBool(node.getMetaDataEntry("is_experimental", False))
+        self.is_experimental |= is_experimental
+
+    def setExtruderNode(self, position: int, node: "ContainerNode") -> None:
+        self.nodes_for_extruders[position] = node
+
+        # Update is_experimental flag
+        is_experimental = parseBool(node.getMetaDataEntry("is_experimental", False))
+        self.is_experimental |= is_experimental

cura/Machines/QualityManager.py

@@ -235,7 +235,7 @@ class QualityManager(QObject):
 
                 for quality_type, quality_node in node.quality_type_map.items():
                     quality_group = QualityGroup(quality_node.getMetaDataEntry("name", ""), quality_type)
-                    quality_group.node_for_global = quality_node
+                    quality_group.setGlobalNode(quality_node)
                     quality_group_dict[quality_type] = quality_group
                 break
 
@@ -337,7 +337,7 @@ class QualityManager(QObject):
 
                         quality_group = quality_group_dict[quality_type]
                         if position not in quality_group.nodes_for_extruders:
-                            quality_group.nodes_for_extruders[position] = quality_node
+                            quality_group.setExtruderNode(position, quality_node)
 
                 # If the machine has its own specific qualities, for extruders, it should skip the global qualities
                 # and use the material/variant specific qualities.
@@ -367,7 +367,7 @@ class QualityManager(QObject):
             if node and node.quality_type_map:
                 for quality_type, quality_node in node.quality_type_map.items():
                     quality_group = QualityGroup(quality_node.getMetaDataEntry("name", ""), quality_type)
-                    quality_group.node_for_global = quality_node
+                    quality_group.setGlobalNode(quality_node)
                     quality_group_dict[quality_type] = quality_group
                 break
 

cura/Machines/VariantManager.py

@@ -107,7 +107,7 @@ class VariantManager:
                     break
             return variant_node
 
-        return self._machine_to_variant_dict_map[machine_definition_id].get(variant_type, {}).get(variant_name)
+        return self._machine_to_variant_dict_map.get(machine_definition_id, {}).get(variant_type, {}).get(variant_name)
 
     def getVariantNodes(self, machine: "GlobalStack", variant_type: "VariantType") -> Dict[str, ContainerNode]:
         machine_definition_id = machine.definition.getId()

cura/Scene/ConvexHullNode.py

@@ -1,7 +1,10 @@
 # Copyright (c) 2015 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
+from typing import Optional
 
 from UM.Application import Application
+from UM.Math.Polygon import Polygon
+from UM.Qt.QtApplication import QtApplication
 from UM.Scene.SceneNode import SceneNode
 from UM.Resources import Resources
 from UM.Math.Color import Color
@@ -16,7 +19,7 @@ class ConvexHullNode(SceneNode):
     #   location an object uses on the buildplate. This area (or area's in case of one at a time printing) is
     #   then displayed as a transparent shadow. If the adhesion type is set to raft, the area is extruded
     #   to represent the raft as well.
-    def __init__(self, node, hull, thickness, parent = None):
+    def __init__(self, node: SceneNode, hull: Optional[Polygon], thickness: float, parent: Optional[SceneNode] = None) -> None:
         super().__init__(parent)
 
         self.setCalculateBoundingBox(False)
@@ -25,7 +28,11 @@ class ConvexHullNode(SceneNode):
 
         # Color of the drawn convex hull
         if not Application.getInstance().getIsHeadLess():
-            self._color = Color(*Application.getInstance().getTheme().getColor("convex_hull").getRgb())
+            theme = QtApplication.getInstance().getTheme()
+            if theme:
+                self._color = Color(*theme.getColor("convex_hull").getRgb())
+            else:
+                self._color = Color(0, 0, 0)
         else:
             self._color = Color(0, 0, 0)
 
@@ -75,7 +82,7 @@ class ConvexHullNode(SceneNode):
 
         return True
 
-    def _onNodeDecoratorsChanged(self, node):
+    def _onNodeDecoratorsChanged(self, node: SceneNode) -> None:
         convex_hull_head = self._node.callDecoration("getConvexHullHead")
         if convex_hull_head:
             convex_hull_head_builder = MeshBuilder()

cura/Settings/MachineManager.py

@@ -618,6 +618,14 @@ class MachineManager(QObject):
                 is_supported = self._current_quality_group.is_available
         return is_supported
 
+    @pyqtProperty(bool, notify = activeQualityGroupChanged)
+    def isActiveQualityExperimental(self) -> bool:
+        is_experimental = False
+        if self._global_container_stack:
+            if self._current_quality_group:
+                is_experimental = self._current_quality_group.is_experimental
+        return is_experimental
+
     ##  Returns whether there is anything unsupported in the current set-up.
     #
     #   The current set-up signifies the global stack and all extruder stacks,

plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml

@@ -9,10 +9,10 @@ import Cura 1.0 as Cura
 
 Rectangle {
     property var iconSource: null;
-    color: clickArea.containsMouse ? UM.Theme.getColor("primary_hover") : UM.Theme.getColor("primary");  // "Cura Blue"
+    color: "#0a0850" // TODO: Theme!
     height: width;
     radius: Math.round(0.5 * width);
-    width: 36 * screenScaleFactor;
+    width: 24 * screenScaleFactor;
 
     UM.RecolorImage {
         id: icon;

plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml

@@ -10,14 +10,13 @@ import QtGraphicalEffects 1.0
 
 Component
 {
-    Rectangle
+    Item
     {
         id: monitorFrame
 
         property var emphasisColor: UM.Theme.getColor("setting_control_border_highlight")
         property var cornerRadius: UM.Theme.getSize("monitor_corner_radius").width
 
-        color: "transparent"
         height: maximumHeight
         onVisibleChanged:
         {
@@ -48,13 +47,45 @@ Component
             }
         }
 
+        ScrollView
+        {
+            id: printers
+            anchors
+            {
+                left: queue.left
+                right: queue.right
+                top: parent.top
+                topMargin: 48 * screenScaleFactor // TODO: Theme!
+            }
+            height: 264 * screenScaleFactor // TODO: Theme!
+
+            Row
+            {
+                spacing: 60 * screenScaleFactor // TODO: Theme!
+                
+                Repeater
+                {
+                    model: OutputDevice.printers
+
+                    MonitorPrinterCard
+                    {
+                        printer: modelData
+                    }
+                }
+            }
+        }
+
         Item
         {
             id: queue
+            width: Math.min(834 * screenScaleFactor, maximumWidth)
 
-            anchors.fill: parent
+            anchors {
-            anchors.top: parent.top
+                bottom: parent.bottom
-            anchors.topMargin: 400 * screenScaleFactor // TODO: Insert carousel here
+                horizontalCenter: parent.horizontalCenter
+                top: printers.bottom
+                topMargin: 48 * screenScaleFactor // TODO: Theme!
+            }
 
             Label
             {
@@ -104,7 +135,6 @@ Component
                     text: catalog.i18nc("@label link to connect manager", "Manage queue in Cura Connect")
                 }
             }
-            
 
             MouseArea
             {
@@ -187,7 +217,7 @@ Component
                 }
                 style: UM.Theme.styles.scrollview
                 visible: OutputDevice.receivedPrintJobs
-                width: Math.min(834 * screenScaleFactor, maximumWidth)
+                width: parent.width
 
                 ListView
                 {
@@ -214,5 +244,4 @@ Component
             visible: OutputDevice.activeCameraUrl != ""
         }
     }
-    
 }

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml

@@ -0,0 +1,137 @@
+// Copyright (c) 2018 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.3
+import QtQuick.Controls.Styles 1.3
+import QtQuick.Controls 1.4
+import UM 1.3 as UM
+
+/**
+ * NOTE: For most labels, a fixed height with vertical alignment is used to make
+ * layouts more deterministic (like the fixed-size textboxes used in original
+ * mock-ups). This is also a stand-in for CSS's 'line-height' property. Denoted
+ * with '// FIXED-LINE-HEIGHT:'.
+ */
+Item
+{
+    id: base
+    property var printJob: null
+    property var progress:
+    {
+        if (!printJob)
+        {
+            return 0
+        }
+        var result = printJob.timeElapsed / printJob.timeTotal
+        if (result > 1.0)
+        {
+            result = 1.0
+        }
+        return result
+    }
+    property var remainingTime:
+    {
+        if (!printJob) {
+            return 0
+        }
+        /* Sometimes total minus elapsed is less than 0. Use Math.max() to prevent remaining
+            time from ever being less than 0. Negative durations cause strange behavior such
+            as displaying "-1h -1m". */
+        return Math.max(printer.activePrintJob.timeTotal - printer.activePrintJob.timeElapsed, 0)
+    }
+    property var progressText:
+    {
+        if (!printJob)
+        {
+            return "";
+        }
+        switch (printJob.state)
+        {
+            case "wait_cleanup":
+                if (printJob.timeTotal > printJob.timeElapsed)
+                {
+                    return catalog.i18nc("@label:status", "Aborted")
+                }
+                return catalog.i18nc("@label:status", "Finished")
+            case "pre_print":
+            case "sent_to_printer":
+                return catalog.i18nc("@label:status", "Preparing")
+            case "aborted":
+                return catalog.i18nc("@label:status", "Aborted")
+            case "wait_user_action":
+                return catalog.i18nc("@label:status", "Aborted")
+            case "pausing":
+                return catalog.i18nc("@label:status", "Pausing")
+            case "paused":
+                return OutputDevice.formatDuration( remainingTime )
+            case "resuming":
+                return catalog.i18nc("@label:status", "Resuming")
+            case "queued":
+                return catalog.i18nc("@label:status", "Action required")
+            default:
+                return OutputDevice.formatDuration( remainingTime )
+        }
+    }
+    width: childrenRect.width
+    height: 18 * screenScaleFactor // TODO: Theme!
+
+    ProgressBar
+    {
+        id: progressBar
+        anchors
+        {
+            verticalCenter: parent.verticalCenter
+        }
+        value: progress;
+        style: ProgressBarStyle
+        {
+            background: Rectangle
+            {
+                color: "#e4e4f2" // TODO: Theme!
+                implicitHeight: visible ? 8 * screenScaleFactor : 0 // TODO: Theme!
+                implicitWidth: 180 * screenScaleFactor // TODO: Theme!
+                radius: 4 * screenScaleFactor // TODO: Theme!
+            }
+            progress: Rectangle
+            {
+                id: progressItem;
+                color:
+                {
+                    if (printJob)
+                    {
+                        var state = printJob.state
+                        var inactiveStates = [
+                            "pausing",
+                            "paused",
+                            "resuming",
+                            "wait_cleanup"
+                        ]
+                        if (inactiveStates.indexOf(state) > -1 && remainingTime > 0)
+                        {
+                            return UM.Theme.getColor("monitor_progress_fill_inactive")
+                        }
+                    }
+                    return "#0a0850" // TODO: Theme!
+                }
+                radius: 4 * screenScaleFactor // TODO: Theme!
+            }
+        }
+    }
+    Label
+    {
+        id: progressLabel
+        anchors
+        {
+            left: progressBar.right
+            leftMargin: 18 * screenScaleFactor // TODO: Theme!
+        }
+        text: progressText
+        color: "#374355" // TODO: Theme!
+        width: contentWidth
+        font: UM.Theme.getFont("medium") // 14pt, regular
+
+        // FIXED-LINE-HEIGHT:
+        height: 18 * screenScaleFactor // TODO: Theme!
+        verticalAlignment: Text.AlignVCenter
+    }
+}

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml

@@ -0,0 +1,242 @@
+// Copyright (c) 2018 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.3
+import QtQuick.Controls 2.0
+import UM 1.3 as UM
+
+/**
+ * A Printer Card is has two main components: the printer portion and the print
+ * job portion, the latter being paired in the UI when a print job is paired
+ * a printer in-cluster.
+ *
+ * NOTE: For most labels, a fixed height with vertical alignment is used to make
+ * layouts more deterministic (like the fixed-size textboxes used in original
+ * mock-ups). This is also a stand-in for CSS's 'line-height' property. Denoted
+ * with '// FIXED-LINE-HEIGHT:'.
+ */
+Item
+{
+    id: base
+
+    // The printer which all printer data is derived from
+    property var printer: null
+
+    property var borderSize: 1 * screenScaleFactor // TODO: Theme, and remove from here
+
+    width: 834 * screenScaleFactor // TODO: Theme!
+    height: 216 * screenScaleFactor // TODO: Theme!
+
+    // Printer portion
+    Rectangle
+    {
+        id: printerInfo
+        border
+        {
+            color: "#EAEAEC" // TODO: Theme!
+            width: borderSize // TODO: Remove once themed
+        }
+        color: "white" // TODO: Theme!
+        width: parent.width
+        height: 144 * screenScaleFactor // TODO: Theme!
+
+        Row
+        {
+            anchors
+            {
+                left: parent.left
+                leftMargin: 36 * screenScaleFactor // TODO: Theme!
+                verticalCenter: parent.verticalCenter
+            }
+            spacing: 18 * screenScaleFactor // TODO: Theme!
+
+            Image
+            {
+                id: printerImage
+                width: 108 * screenScaleFactor // TODO: Theme!
+                height: 108 * screenScaleFactor // TODO: Theme!
+                fillMode: Image.PreserveAspectFit
+                source: "../png/" + printer.type + ".png"
+                mipmap: true
+            }
+
+            Item
+            {
+                anchors
+                {
+                    verticalCenter: parent.verticalCenter
+                }
+                width: 216 * screenScaleFactor // TODO: Theme!
+                height: printerNameLabel.height + printerFamilyPill.height + 6 * screenScaleFactor // TODO: Theme!
+
+                Label
+                {
+                    id: printerNameLabel
+                    text: printer && printer.name ? printer.name : ""
+                    color: "#414054" // TODO: Theme!
+                    elide: Text.ElideRight
+                    font: UM.Theme.getFont("large") // 16pt, bold
+                    width: parent.width
+
+                    // FIXED-LINE-HEIGHT:
+                    height: 18 * screenScaleFactor // TODO: Theme!
+                    verticalAlignment: Text.AlignVCenter
+                }
+
+                MonitorPrinterPill
+                {
+                    id: printerFamilyPill
+                    anchors
+                    {
+                        top: printerNameLabel.bottom
+                        topMargin: 6 * screenScaleFactor // TODO: Theme!
+                        left: printerNameLabel.left
+                    }
+                    text: printer.type
+                }
+            }
+
+            MonitorPrinterConfiguration
+            {
+                id: printerConfiguration
+                anchors.verticalCenter: parent.verticalCenter
+                buildplate: "Glass"
+                configurations:
+                [
+                    base.printer.printerConfiguration.extruderConfigurations[0],
+                    base.printer.printerConfiguration.extruderConfigurations[1]
+                ]
+                height: 72 * screenScaleFactor // TODO: Theme!
+            }
+        }
+
+        PrintJobContextMenu
+        {
+            id: contextButton
+            anchors
+            {
+                right: parent.right
+                rightMargin: 12 * screenScaleFactor // TODO: Theme!
+                top: parent.top
+                topMargin: 12 * screenScaleFactor // TODO: Theme!
+            }
+            printJob: printer.activePrintJob
+            width: 36 * screenScaleFactor // TODO: Theme!
+            height: 36 * screenScaleFactor // TODO: Theme!
+        }
+        CameraButton
+        {
+            id: cameraButton;
+            anchors
+            {
+                right: parent.right
+                rightMargin: 20 * screenScaleFactor // TODO: Theme!
+                bottom: parent.bottom
+                bottomMargin: 20 * screenScaleFactor // TODO: Theme!
+            }
+            iconSource: "../svg/icons/camera.svg"
+        }
+    }
+
+
+    // Print job portion
+    Rectangle
+    {
+        id: printJobInfo
+        anchors
+        {
+            top: printerInfo.bottom
+            topMargin: -borderSize * screenScaleFactor // TODO: Theme!
+        }
+        border
+        {
+            color: "#EAEAEC" // TODO: Theme!
+            width: borderSize // TODO: Remove once themed
+        }
+        color: "white" // TODO: Theme!
+        height: 84 * screenScaleFactor + borderSize // TODO: Remove once themed
+        width: parent.width
+
+        Row
+        {
+            anchors
+            {
+                fill: parent
+                topMargin: 12 * screenScaleFactor + borderSize // TODO: Theme!
+                bottomMargin: 12 * screenScaleFactor // TODO: Theme!
+                leftMargin: 36 * screenScaleFactor // TODO: Theme!
+            }
+            height: childrenRect.height
+            spacing: 18 * screenScaleFactor // TODO: Theme!
+
+            Item
+            {
+                anchors
+                {
+                    verticalCenter: parent.verticalCenter
+                }
+                width: printerImage.width
+                height: 60 * screenScaleFactor // TODO: Theme!
+                MonitorPrintJobPreview
+                {
+                    anchors.centerIn: parent
+                    printJob: base.printer.activePrintJob
+                    size: parent.height
+                }
+            }
+
+            Item
+            {
+                anchors
+                {
+                    verticalCenter: parent.verticalCenter
+                }
+                width: 216 * screenScaleFactor // TODO: Theme!
+                height: printerNameLabel.height + printerFamilyPill.height + 6 * screenScaleFactor // TODO: Theme!
+
+                Label
+                {
+                    id: printerJobNameLabel
+                    text: base.printer.activePrintJob ? base.printer.activePrintJob.name : "Untitled" // TODO: I18N
+                    color: "#414054" // TODO: Theme!
+                    elide: Text.ElideRight
+                    font: UM.Theme.getFont("large") // 16pt, bold
+                    width: parent.width
+
+                    // FIXED-LINE-HEIGHT:
+                    height: 18 * screenScaleFactor // TODO: Theme!
+                    verticalAlignment: Text.AlignVCenter
+                }
+
+                Label
+                {
+                    id: printerJobOwnerLabel
+                    anchors
+                    {
+                        top: printerJobNameLabel.bottom
+                        topMargin: 6 * screenScaleFactor // TODO: Theme!
+                        left: printerJobNameLabel.left
+                    }
+                    text: printer.activePrintJob ? printer.activePrintJob.owner : "Anonymous" // TODO: I18N
+                    color: "#53657d" // TODO: Theme!
+                    elide: Text.ElideRight
+                    font: UM.Theme.getFont("very_small") // 12pt, regular
+                    width: parent.width
+
+                    // FIXED-LINE-HEIGHT:
+                    height: 18 * screenScaleFactor // TODO: Theme!
+                    verticalAlignment: Text.AlignVCenter
+                }
+            }
+
+            MonitorPrintJobProgressBar
+            {
+                anchors
+                {
+                    verticalCenter: parent.verticalCenter
+                }
+                printJob: printer.activePrintJob
+            }
+        }
+    }
+}

plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml

@@ -25,7 +25,7 @@ Item {
         }
         contentItem: Label {
             color: UM.Theme.getColor("monitor_context_menu_dots");
-            font.pixelSize: 25 * screenScaleFactor;
+            font.pixelSize: 32 * screenScaleFactor;
             horizontalAlignment: Text.AlignHCenter;
             text: button.text;
             verticalAlignment: Text.AlignVCenter;
@@ -41,7 +41,7 @@ Item {
             var states = ["queued", "sent_to_printer", "pre_print", "printing", "pausing", "paused", "resuming"];
             return states.indexOf(printJob.state) !== -1;
         }
-        width: 35 * screenScaleFactor; // TODO: Theme!
+        width: 36 * screenScaleFactor; // TODO: Theme!
     }
 
     Popup {

plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg

@@ -0,0 +1,5 @@
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M4.298828,0.998047 L7.7,0.998047 L8.7,3 L12,3 L12,10 L0,10 L0,3 L3.3,3 L4.298828,0.998047 Z M6,4 C4.625211,4 3.5,5.1252 3.5,6.5 C3.5,7.8748 4.625211,9 6,9 C7.37479,9 8.5,7.8748 8.5,6.5 C8.5,5.1252 7.37479,4 6,4 Z M6,5 C6.83435,5 7.5,5.6657 7.5,6.5 C7.5,7.3343 6.83435,8 6,8 C5.165651,8 4.5,7.3343 4.5,6.5 C4.5,5.6657 5.165651,5 6,5 Z" id="Combined-Shape" fill="#0A0850" fill-rule="nonzero"></path>
+    </g>
+</svg>

plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py

@@ -65,7 +65,6 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
         self._received_print_jobs = False # type: bool
 
         self._monitor_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../resources/qml/ClusterMonitorItem.qml")
-        self._control_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../resources/qml/ClusterControlItem.qml")
 
         # See comments about this hack with the clusterPrintersChanged signal
         self.printersChanged.connect(self.clusterPrintersChanged)

resources/definitions/cocoon_create_modelmaker.def.json

@@ -51,7 +51,7 @@
             "default_value": 220
         },
         "layer_height": {
-            "default_value": 0.15
+            "default_value": 0.10
         },
         "layer_height_0": {
             "default_value": 0.2

resources/qml/Menus/ProfileMenu.qml

@@ -17,18 +17,21 @@ Menu
 
         MenuItem
         {
-            text: (model.layer_height != "") ? model.name + " - " + model.layer_height + model.layer_height_unit : model.name
+            text:
+            {
+                var full_text = (model.layer_height != "") ? model.name + " - " + model.layer_height + model.layer_height_unit : model.name
+                full_text += model.is_experimental ? " - Experimental" : ""
+                return full_text
+            }
             checkable: true
             checked: Cura.MachineManager.activeQualityOrQualityChangesName == model.name
             exclusiveGroup: group
-            onTriggered: {
+            onTriggered: Cura.MachineManager.setQualityGroup(model.quality_group)
-                Cura.MachineManager.setQualityGroup(model.quality_group)
-            }
             visible: model.available
         }
 
-        onObjectAdded: menu.insertItem(index, object);
+        onObjectAdded: menu.insertItem(index, object)
-        onObjectRemoved: menu.removeItem(object);
+        onObjectRemoved: menu.removeItem(object)
     }
 
     MenuSeparator

resources/qml/Settings/SettingView.qml

@@ -62,11 +62,18 @@ Item
             activeFocusOnPress: true
             menu: ProfileMenu { }
 
-            function generateActiveQualityText () {
+            function generateActiveQualityText ()
-                var result = Cura.MachineManager.activeQualityOrQualityChangesName;
+            {
+                var result = Cura.MachineManager.activeQualityOrQualityChangesName
+                if (Cura.MachineManager.isActiveQualityExperimental)
+                {
+                    result += " (Experimental)"
+                }
 
-                if (Cura.MachineManager.isActiveQualitySupported) {
+                if (Cura.MachineManager.isActiveQualitySupported)
-                    if (Cura.MachineManager.activeQualityLayerHeight > 0) {
+                {
+                    if (Cura.MachineManager.activeQualityLayerHeight > 0)
+                    {
                         result += " <font color=\"" + UM.Theme.getColor("text_detail") + "\">"
                         result += " - "
                         result += Cura.MachineManager.activeQualityLayerHeight + "mm"

resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg

@@ -10,6 +10,7 @@ quality_type = normal
 weight = 0
 material = generic_pc
 variant = AA 0.25
+is_experimental = True
 
 [values]
 acceleration_enabled = True

resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg

@@ -10,6 +10,7 @@ quality_type = normal
 weight = 0
 material = generic_pp
 variant = AA 0.25
+is_experimental = True
 
 [values]
 acceleration_enabled = True

resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg

@@ -10,6 +10,7 @@ quality_type = draft
 weight = -2
 material = generic_cpe_plus
 variant = AA 0.8
+is_experimental = True
 
 [values]
 brim_width = 14

resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg

@@ -10,6 +10,7 @@ quality_type = superdraft
 weight = -4
 material = generic_cpe_plus
 variant = AA 0.8
+is_experimental = True
 
 [values]
 brim_width = 14

resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg

@@ -10,6 +10,7 @@ quality_type = verydraft
 weight = -3
 material = generic_cpe_plus
 variant = AA 0.8
+is_experimental = True
 
 [values]
 brim_width = 14

resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg

@@ -10,6 +10,7 @@ quality_type = draft
 weight = 0
 material = generic_pc
 variant = AA 0.8
+is_experimental = True
 
 [values]
 brim_width = 14

resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg

@@ -10,6 +10,7 @@ quality_type = superdraft
 weight = -2
 material = generic_pc
 variant = AA 0.8
+is_experimental = True
 
 [values]
 brim_width = 14

resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg

@@ -10,6 +10,7 @@ quality_type = verydraft
 weight = -1
 material = generic_pc
 variant = AA 0.8
+is_experimental = True
 
 [values]
 brim_width = 14

resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg

@@ -10,6 +10,7 @@ quality_type = normal
 weight = 0
 material = generic_pc
 variant = AA 0.25
+is_experimental = True
 
 [values]
 acceleration_enabled = True

resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg

@@ -10,6 +10,7 @@ quality_type = normal
 weight = 0
 material = generic_pp
 variant = AA 0.25
+is_experimental = True
 
 [values]
 acceleration_enabled = True

resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg

@@ -10,6 +10,7 @@ quality_type = draft
 weight = -2
 material = generic_cpe_plus
 variant = AA 0.8
+is_experimental = True
 
 [values]
 brim_width = 14

resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg

@@ -10,6 +10,7 @@ quality_type = superdraft
 weight = -4
 material = generic_cpe_plus
 variant = AA 0.8
+is_experimental = True
 
 [values]
 brim_width = 14

resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg

@@ -10,6 +10,7 @@ quality_type = verydraft
 weight = -3
 material = generic_cpe_plus
 variant = AA 0.8
+is_experimental = True
 
 [values]
 brim_width = 14

resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg

@@ -10,6 +10,7 @@ quality_type = draft
 weight = 0
 material = generic_pc
 variant = AA 0.8
+is_experimental = True
 
 [values]
 brim_width = 14

resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg

@@ -10,6 +10,7 @@ quality_type = superdraft
 weight = -2
 material = generic_pc
 variant = AA 0.8
+is_experimental = True
 
 [values]
 brim_width = 14

resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg

@@ -10,6 +10,7 @@ quality_type = verydraft
 weight = -1
 material = generic_pc
 variant = AA 0.8
+is_experimental = True
 
 [values]
 brim_width = 14

resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg

@@ -11,6 +11,7 @@ weight = -2
 material = generic_cpe_plus
 variant = AA 0.8
 buildplate = Aluminum
+is_experimental = True
 
 [values]
 brim_width = 14

resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg

@@ -11,6 +11,7 @@ weight = 0
 material = generic_pc
 variant = AA 0.8
 buildplate = Aluminum
+is_experimental = True
 
 [values]
 brim_width = 10