Merge branch 'master' into CURA-8112_Inform_the_user_about_their_subscription_limits

plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml

@@ -1,10 +1,12 @@
 // Copyright (C) 2021 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
 import QtQuick.Window 2.2
 import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one
 import QtQuick.Controls 2.3
 import QtQuick.Controls.Styles 1.4
+import QtQuick.Layouts 1.1
 
 import UM 1.2 as UM
 import Cura 1.6 as Cura
@@ -29,48 +31,58 @@ Item
         margins: UM.Theme.getSize("default_margin").width
     }
 
-    Label
+    RowLayout
     {
-        id: selectProjectLabel
+        id: headerRow
 
-        text: "Select Project"
-        font: UM.Theme.getFont("medium")
-        color: UM.Theme.getColor("small_button_text")
-        anchors.top: parent.top
-        anchors.left: parent.left
-        visible: projectListContainer.visible
-    }
-
-    Cura.SecondaryButton
-    {
-        id: createNewProjectButton
-
-        anchors.verticalCenter: selectProjectLabel.verticalCenter
-        anchors.right: parent.right
-        text: "New Library project"
-        visible: createNewProjectButtonVisible && manager.userAccountCanCreateNewLibraryProject && (manager.retrievingProjectsStatus == DF.RetrievalStatus.Success || manager.retrievingProjectsStatus == DF.RetrievalStatus.Failed)
-
-        onClicked:
+        anchors
         {
-            createNewProjectPopup.open()
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+        height: childrenRect.height
+        spacing: UM.Theme.getSize("default_margin").width
+
+        Cura.TextField
+        {
+            id: searchBar
+            Layout.fillWidth: true
+            implicitHeight: createNewProjectButton.height
+
+            onTextEdited: manager.projectFilter = text //Update the search filter when editing this text field.
+
+            leftIcon: UM.Theme.getIcon("Magnifier")
+            placeholderText: "Search"
+        }
+
+        Cura.SecondaryButton
+        {
+            id: createNewProjectButton
+
+            text: "New Library project"
+            visible: createNewProjectButtonVisible && manager.userAccountCanCreateNewLibraryProject && (manager.retrievingProjectsStatus == DF.RetrievalStatus.Success || manager.retrievingProjectsStatus == DF.RetrievalStatus.Failed)
+
+            onClicked:
+            {
+                createNewProjectPopup.open()
+            }
+            busy: manager.creatingNewProjectStatus == DF.RetrievalStatus.InProgress
         }
-        busy: manager.creatingNewProjectStatus == DF.RetrievalStatus.InProgress
-    }
 
 
-    Cura.SecondaryButton
-    {
-        id: upgradePlanButton
+        Cura.SecondaryButton
+        {
+            id: upgradePlanButton
 
-        anchors.verticalCenter: selectProjectLabel.verticalCenter
-        anchors.right: parent.right
-        text: "Upgrade plan"
-        iconSource: UM.Theme.getIcon("LinkExternal")
-        visible: createNewProjectButtonVisible && !manager.userAccountCanCreateNewLibraryProject && (manager.retrievingProjectsStatus == DF.RetrievalStatus.Success || manager.retrievingProjectsStatus == DF.RetrievalStatus.Failed)
-        tooltip: "You have reached the maximum number of projects allowed by your subscription. Please upgrade to the Professional subscription to create more projects."
-        tooltipWidth: parent.width * 0.5
+            text: "Upgrade plan"
+            iconSource: UM.Theme.getIcon("LinkExternal")
+            visible: createNewProjectButtonVisible && !manager.userAccountCanCreateNewLibraryProject && (manager.retrievingProjectsStatus == DF.RetrievalStatus.Success || manager.retrievingProjectsStatus == DF.RetrievalStatus.Failed)
+            tooltip: "You have reached the maximum number of projects allowed by your subscription. Please upgrade to the Professional subscription to create more projects."
+            tooltipWidth: parent.width * 0.5
 
-        onClicked: Qt.openUrlExternally("https://ultimaker.com/software/enterprise-software")
+            onClicked: Qt.openUrlExternally("https://ultimaker.com/software/enterprise-software")
+        }
     }
 
     Item
@@ -93,7 +105,7 @@ Item
             {
                 id: digitalFactoryImage
                 anchors.horizontalCenter: parent.horizontalCenter
-                source: "../images/digital_factory.svg"
+                source: searchBar.text === "" ? "../images/digital_factory.svg" : "../images/projects_not_found.svg"
                 fillMode: Image.PreserveAspectFit
                 width: parent.width - 2 * UM.Theme.getSize("thick_margin").width
                 sourceSize.width: width
@@ -104,8 +116,9 @@ Item
             {
                 id: noLibraryProjectsLabel
                 anchors.horizontalCenter: parent.horizontalCenter
-                text: "It appears that you don't have any projects in the Library yet."
+                text: searchBar.text === "" ? "It appears that you don't have any projects in the Library yet." : "No projects found that match the search query."
                 font: UM.Theme.getFont("medium")
+                color: UM.Theme.getColor("text")
             }
 
             Cura.TertiaryButton
@@ -114,6 +127,7 @@ Item
                 anchors.horizontalCenter: parent.horizontalCenter
                 text: "Visit Digital Library"
                 onClicked:  Qt.openUrlExternally(CuraApplication.ultimakerDigitalFactoryUrl + "/app/library")
+                visible: searchBar.text === "" //Show the link to Digital Library when there are no projects in the user's Library.
             }
         }
     }
@@ -123,7 +137,7 @@ Item
         id: projectListContainer
         anchors
         {
-            top: selectProjectLabel.bottom
+            top: headerRow.bottom
             topMargin: UM.Theme.getSize("default_margin").height
             bottom: parent.bottom
             left: parent.left