Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding

resources/qml/MainWindow/MainWindowHeader.qml

@@ -117,6 +117,25 @@ Item
             rightMargin: UM.Theme.getSize("default_margin").width
             verticalCenter: parent.verticalCenter
         }
+
+        Cura.NotificationIcon
+        {
+            id: marketplaceNotificationIcon
+            anchors
+            {
+                top: parent.top
+                right: parent.right
+                rightMargin: (-0.5 * width) | 0
+                topMargin: (-0.5 * height) | 0
+            }
+            visible: CuraApplication.getPackageManager().packagesWithUpdate.length > 0
+
+            labelText:
+            {
+                const itemCount = CuraApplication.getPackageManager().packagesWithUpdate.length
+                return itemCount > 9 ? "9+" : itemCount
+            }
+        }
     }
 
     AccountWidget

resources/qml/Settings/SettingItem.qml

@@ -62,14 +62,19 @@ Item
 
         var tooltip = "<b>%1</b>\n<p>%2</p>".arg(definition.label).arg(definition.description)
 
+        if(!propertyProvider.isValueUsed)
+        {
+            tooltip += "<i>%1</i><br/><br/>".arg(catalog.i18nc("@label", "This setting is not used because all the settings that it influences are overriden."))
+        }
+
         if (affects_list != "")
         {
-            tooltip += "<br/><b>%1</b>\n<ul>\n%2</ul>".arg(catalog.i18nc("@label Header for list of settings.", "Affects")).arg(affects_list)
+            tooltip += "<b>%1</b><ul>%2</ul>".arg(catalog.i18nc("@label Header for list of settings.", "Affects")).arg(affects_list)
         }
 
         if (affected_by_list != "")
         {
-            tooltip += "<br/><b>%1</b>\n<ul>\n%2</ul>".arg(catalog.i18nc("@label Header for list of settings.", "Affected By")).arg(affected_by_list)
+            tooltip += "<b>%1</b><ul>%2</ul>".arg(catalog.i18nc("@label Header for list of settings.", "Affected By")).arg(affected_by_list)
         }
 
         return tooltip

resources/qml/Widgets/NotificationIcon.qml

@@ -0,0 +1,35 @@
+// Copyright (c) 2019 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+
+import UM 1.4 as UM
+
+
+//
+// A notification icon which is a circle with a number at the center, that can be used to indicate, for example, how
+// many new messages that are available.
+//
+Rectangle
+{
+    id: notificationIcon
+    color: UM.Theme.getColor("notification_icon")
+    width: UM.Theme.getSize("notification_icon").width
+    height: UM.Theme.getSize("notification_icon").height
+    radius: (0.5 * width) | 0
+
+    property alias labelText: notificationLabel.text
+    property alias labelFont: notificationLabel.font
+
+    Label
+    {
+        id: notificationLabel
+        anchors.centerIn: parent
+        anchors.fill: parent
+        color: UM.Theme.getColor("primary_text")
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        font: UM.Theme.getFont("small")
+    }
+}

resources/qml/qmldir

@@ -21,11 +21,12 @@ ToolTip 1.0 ToolTip.qml
 
 # Cura/Widgets
 
-CheckBox    1.0 CheckBox.qml
-ComboBox    1.0 ComboBox.qml
-ProgressBar 1.0 ProgressBar.qml
-RadioButton 1.0 RadioButton.qml
-TabButton   1.0 TabButton.qml
+CheckBox            1.0 CheckBox.qml
+ComboBox            1.0 ComboBox.qml
+NotificationIcon    1.0 NotificationIcon.qml
+ProgressBar         1.0 ProgressBar.qml
+RadioButton         1.0 RadioButton.qml
+TabButton           1.0 TabButton.qml
 
 
 # Cura/MachineSettings