Revert "Revert "fix merge conflict""

This reverts commit 4bffa6d90f.

resources/qml/PrinterTypeLabel.qml

@@ -0,0 +1,34 @@
+// Copyright (c) 2018 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.7
+import QtQuick.Controls 2.1
+
+import UM 1.1 as UM
+
+// This component creates a label with the abbreviated name of a printer, with a rectangle surrounding the label.
+// It is created in a separated place in order to be reused whenever needed.
+Item
+{
+    property alias text: printerTypeLabel.text
+
+    width: UM.Theme.getSize("printer_type_label").width
+    height: UM.Theme.getSize("printer_type_label").height
+
+    Rectangle
+    {
+        anchors.fill: parent
+        color: UM.Theme.getColor("printer_type_label_background")
+    }
+
+    Label
+    {
+        id: printerTypeLabel
+        text: "CFFFP" // As an abbreviated name of the Custom FFF Printer
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.horizontalCenter: parent.horizontalCenter
+        renderType: Text.NativeRendering
+        font: UM.Theme.getFont("default")
+        color: UM.Theme.getColor("text")
+    }
+}