Merge branch 'master' into CURA-6627_Store_extra_data_project_files

resources/qml/Actions.qml

@@ -54,6 +54,7 @@ Item
     property alias manageProfiles: manageProfilesAction;
 
     property alias manageMaterials: manageMaterialsAction;
+    property alias marketplaceMaterials: marketplaceMaterialsAction;
 
     property alias preferences: preferencesAction;
 
@@ -188,6 +189,12 @@ Item
         shortcut: "Ctrl+K"
     }
 
+    Action
+    {
+        id: marketplaceMaterialsAction
+        text: catalog.i18nc("@action:inmenu", "Add more materials from Marketplace")
+    }
+
     Action
     {
         id: updateProfileAction;

resources/qml/Cura.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Ultimaker B.V.
+// Copyright (c) 2020 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.7
@@ -21,7 +21,16 @@ UM.MainWindow
     id: base
 
     // Cura application window title
-    title: PrintInformation.jobName + " - " + catalog.i18nc("@title:window", CuraApplication.applicationDisplayName)
+    title:
+    {
+        let result = "";
+        if(PrintInformation.jobName != "")
+        {
+            result += PrintInformation.jobName + " - ";
+        }
+        result += CuraApplication.applicationDisplayName;
+        return result;
+    }
 
     backgroundColor: UM.Theme.getColor("viewport_background")
 
@@ -244,23 +253,6 @@ UM.MainWindow
                 }
             }
 
-            Toolbar
-            {
-                // The toolbar is the left bar that is populated by all the tools (which are dynamicly populated by
-                // plugins)
-                id: toolbar
-
-                property int mouseX: base.mouseX
-                property int mouseY: base.mouseY
-
-                anchors
-                {
-                    verticalCenter: parent.verticalCenter
-                    left: parent.left
-                }
-                visible: CuraApplication.platformActivity && !PrintInformation.preSliced
-            }
-
             ObjectSelector
             {
                 id: objectSelector
@@ -302,6 +294,23 @@ UM.MainWindow
                 }
             }
 
+            Toolbar
+            {
+                // The toolbar is the left bar that is populated by all the tools (which are dynamicly populated by
+                // plugins)
+                id: toolbar
+
+                property int mouseX: base.mouseX
+                property int mouseY: base.mouseY
+
+                anchors
+                {
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                }
+                visible: CuraApplication.platformActivity && !PrintInformation.preSliced
+            }
+
             // A hint for the loaded content view. Overlay items / controls can safely be placed in this area
             Item {
                 id: mainSafeArea

resources/qml/MainWindow/ApplicationMenu.qml

@@ -154,7 +154,7 @@ Item
         }
     }
 
-    // show the plugin browser dialog
+    // show the Toolbox
     Connections
     {
         target: Cura.Actions.browsePackages
@@ -163,4 +163,15 @@ Item
             curaExtensions.callExtensionMethod("Toolbox", "launch")
         }
     }
+
+    // Show the Marketplace dialog at the materials tab
+    Connections
+    {
+        target: Cura.Actions.marketplaceMaterials
+        onTriggered:
+        {
+            curaExtensions.callExtensionMethod("Toolbox", "launch")
+            curaExtensions.callExtensionMethod("Toolbox", "setViewCategoryToMaterials")
+        }
+    }
 }

resources/qml/Menus/MaterialMenu.qml

@@ -157,4 +157,11 @@ Menu
     {
         action: Cura.Actions.manageMaterials
     }
+
+    MenuSeparator {}
+
+    MenuItem
+    {
+        action: Cura.Actions.marketplaceMaterials
+    }
 }