Add printer name textfield into AddLocalPrinter

CURA-6435

resources/qml/WelcomePages/AddLocalPrinterScrollView.qml

@@ -12,9 +12,12 @@ import Cura 1.0 as Cura
 // This is the scroll view widget for adding a (local) printer. This scroll view shows a list view with printers
 // categorized into 3 categories: "Ultimaker", "Custom", and "Other".
 //
-ScrollView
+Item
 {
+    UM.I18nCatalog { id: catalog; name: "cura" }
+
     id: base
+    height: childrenRect.height
 
     // The currently selected machine item in the local machine list.
     property var currentItem: (machineList.currentIndex >= 0)
@@ -25,12 +28,15 @@ ScrollView
     // By default (when this list shows up) we always expand the "Ultimaker" section.
     property string preferredCategory: "Ultimaker"
 
-    ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
-    ScrollBar.vertical.policy: ScrollBar.AsNeeded
     property int maxItemCountAtOnce: 10  // show at max 10 items at once, otherwise you need to scroll.
-    height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height
 
-    clip: true
+    // User-editable printer name
+    property alias printerName: printerNameTextField.text
+
+    onCurrentItemChanged:
+    {
+        printerName = currentItem == null ? "" : currentItem.name
+    }
 
     function updateCurrentItemUponSectionChange()
     {
@@ -51,6 +57,29 @@ ScrollView
         updateCurrentItemUponSectionChange()
     }
 
+    Item
+    {
+        id: localPrinterSelectionItem
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        height: childrenRect.height
+
+        // ScrollView + ListView for selecting a local printer to add
+        ScrollView
+        {
+            id: scrollView
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.top: parent.top
+
+            height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height
+
+            ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+            ScrollBar.vertical.policy: ScrollBar.AsNeeded
+
+            clip: true
+
             ListView
             {
                 id: machineList
@@ -138,16 +167,50 @@ ScrollView
                     height: visible ? UM.Theme.getSize("standard_list_lineheight").height : 0
 
                     checked: ListView.view.currentIndex == index
-            onCheckedChanged:
-            {
-                if(checked)
-                {
-                    machineList.currentIndex = index
-                }
-            }
                     text: name
                     visible: base.currentSection == section
                     onClicked: ListView.view.currentIndex = index
                 }
             }
         }
+    }
+
+    // Horizontal line
+    Rectangle
+    {
+        id: horizontalLine
+        anchors.top: localPrinterSelectionItem.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: UM.Theme.getSize("default_lining").height
+        color: UM.Theme.getColor("lining")
+    }
+
+    // User-editable printer name row
+    Row
+    {
+        anchors.top: horizontalLine.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.topMargin: UM.Theme.getSize("default_lining").height
+        anchors.leftMargin: UM.Theme.getSize("default_margin").width
+
+        spacing: UM.Theme.getSize("default_margin").width
+
+        Label
+        {
+            text: catalog.i18nc("@label", "Printer Name")
+            anchors.verticalCenter: parent.verticalCenter
+            font: UM.Theme.getFont("medium")
+            verticalAlignment: Text.AlignVCenter
+            renderType: Text.NativeRendering
+        }
+
+        Cura.TextField
+        {
+            id: printerNameTextField
+            anchors.verticalCenter: parent.verticalCenter
+            width: (parent.width / 2) | 0
+        }
+    }
+}

resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml

@@ -139,7 +139,8 @@ Item
             {
                 // Create a local printer
                 const localPrinterItem = addLocalPrinterDropDown.contentItem.currentItem
-                Cura.MachineManager.addMachine(localPrinterItem.id)
+                const printerName = addLocalPrinterDropDown.contentItem.printerName
+                Cura.MachineManager.addMachine(localPrinterItem.id, printerName)
 
                 base.showNextPage()
             }