Merge pull request #846 from Ultimaker/feature_material_editing

Material Editing Support

resources/qml/Preferences/MachinesPage.qml

@@ -27,14 +27,35 @@ UM.ManagementPage
         return -1;
     }
 
-    onAddObject: Printer.requestAddPrinter()
-    onRemoveObject: confirmDialog.open();
-    onRenameObject: renameDialog.open();
-    onActivateObject: Cura.MachineManager.setActiveMachine(base.currentItem.id)
-
-    removeEnabled: base.currentItem != null && model.rowCount() > 1
-    renameEnabled: base.currentItem != null
-    activateEnabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMachineId
+    buttons: [
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Activate");
+            iconName: "list-activate";
+            enabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMaterialId
+            onClicked: Cura.MachineManager.setActiveMachine(base.currentItem.id)
+        },
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Add");
+            iconName: "list-add";
+            onClicked: Printer.requestAddPrinter()
+        },
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Remove");
+            iconName: "list-remove";
+            enabled: base.currentItem != null && model.rowCount() > 1
+            onClicked: confirmDialog.open();
+        },
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Rename");
+            iconName: "edit-rename";
+            enabled: base.currentItem != null
+            onClicked: renameDialog.open();
+        }
+    ]
 
     Item
     {

resources/qml/Preferences/MaterialView.qml

@@ -0,0 +1,252 @@
+// Copyright (c) 2016 Ultimaker B.V.
+// Uranium is released under the terms of the AGPLv3 or higher.
+
+import QtQuick 2.1
+import QtQuick.Controls 1.3
+import QtQuick.Dialogs 1.2
+
+import UM 1.2 as UM
+import Cura 1.0 as Cura
+
+TabView
+{
+    id: base
+
+    property QtObject properties;
+
+    property bool editingEnabled: false;
+    property string currency: UM.Preferences.getValue("general/currency") ? UM.Preferences.getValue("general/currency") : "€"
+    property real firstColumnWidth: width * 0.45
+    property real secondColumnWidth: width * 0.45
+    property string containerId: ""
+
+    Tab
+    {
+        title: "Information"
+        anchors
+        {
+            leftMargin: UM.Theme.getSize("default_margin").width
+            topMargin: UM.Theme.getSize("default_margin").height
+            bottomMargin: UM.Theme.getSize("default_margin").height
+            rightMargin: 0
+        }
+
+        ScrollView
+        {
+            anchors.fill: parent
+            horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
+
+            Flow
+            {
+                id: containerGrid
+
+                width: base.width;
+
+                property real rowHeight: textField.height;
+
+                Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Brand") }
+                ReadOnlyTextField
+                {
+                    id: textField;
+                    width: base.secondColumnWidth;
+                    text: properties.supplier;
+                    readOnly: !base.editingEnabled;
+                    onEditingFinished: Cura.ContainerManager.setContainerMetaDataEntry(base.containerId, "brand", text)
+                }
+
+                Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Material Type") }
+                ReadOnlyTextField
+                {
+                    width: base.secondColumnWidth;
+                    text: properties.material_type;
+                    readOnly: !base.editingEnabled;
+                    onEditingFinished: Cura.ContainerManager.setContainerMetaDataEntry(base.containerId, "material", text)
+                }
+
+                Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Color") }
+
+                Row
+                {
+                    width: base.secondColumnWidth;
+                    height:  parent.rowHeight;
+                    spacing: UM.Theme.getSize("default_margin").width/2
+
+                    Rectangle
+                    {
+                        id: colorSelector
+                        color: properties.color_code
+                        onColorChanged: Cura.ContainerManager.setContainerMetaDataEntry(base.containerId, "color_code", color)
+
+                        width: colorLabel.height * 0.75
+                        height: colorLabel.height * 0.75
+                        border.width: UM.Theme.getSize("default_lining").height
+
+                        anchors.verticalCenter: parent.verticalCenter
+
+                        MouseArea { anchors.fill: parent; onClicked: colorDialog.open(); enabled: base.editingEnabled }
+                    }
+                    ReadOnlyTextField
+                    {
+                        id: colorLabel;
+                        text: properties.color_name;
+                        readOnly: !base.editingEnabled
+                        onEditingFinished: Cura.ContainerManager.setContainerMetaDataEntry(base.containerId, "color_name", text)
+                    }
+
+                    ColorDialog { id: colorDialog; color: properties.color_code; onAccepted: colorSelector.color = color }
+                }
+
+                Item { width: parent.width; height: UM.Theme.getSize("default_margin").height }
+
+                Label { width: parent.width; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: "<b>" + catalog.i18nc("@label", "Properties") + "</b>" }
+
+                Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Density") }
+                ReadOnlySpinBox
+                {
+                    width: base.secondColumnWidth;
+                    value: properties.density;
+                    decimals: 2
+                    suffix: "g/cm"
+                    stepSize: 0.01
+                    readOnly: !base.editingEnabled;
+
+                    onEditingFinished: Cura.ContainerManager.setContainerMetaDataEntry(base.containerId, "properties/density", value)
+                }
+
+                Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Diameter") }
+                ReadOnlySpinBox
+                {
+                    width: base.secondColumnWidth;
+                    value: properties.diameter;
+                    decimals: 2
+                    suffix: "mm³"
+                    stepSize: 0.01
+                    readOnly: !base.editingEnabled;
+
+                    onEditingFinished: Cura.ContainerManager.setContainerMetaDataEntry(base.containerId, "properties/diameter", value)
+                }
+
+                Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament Cost") }
+                SpinBox
+                {
+                    width: base.secondColumnWidth;
+                    value: properties.spool_cost;
+                    prefix: base.currency
+                    enabled: false
+                }
+
+                Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament weight") }
+                SpinBox
+                {
+                    width: base.secondColumnWidth;
+                    value: properties.spool_weight;
+                    suffix: "g";
+                    stepSize: 10
+                    enabled: false
+                }
+
+                Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament length") }
+                SpinBox
+                {
+                    width: base.secondColumnWidth;
+                    value: parseFloat(properties.spool_length);
+                    suffix: "m";
+                    enabled: false
+                }
+
+                Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Cost per Meter (Approx.)") }
+                SpinBox
+                {
+                    width: base.secondColumnWidth;
+                    value: parseFloat(properties.cost_per_meter);
+                    suffix: catalog.i18nc("@label", "%1/m".arg(base.currency));
+                    enabled: false
+                }
+
+                Item { width: parent.width; height: UM.Theme.getSize("default_margin").height }
+
+                Label { width: parent.width; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Description") }
+
+                ReadOnlyTextArea
+                {
+                    text: properties.description;
+                    width: base.firstColumnWidth + base.secondColumnWidth
+                    wrapMode: Text.WordWrap
+
+                    readOnly: !base.editingEnabled;
+
+                    onEditingFinished: Cura.ContainerManager.setContainerMetaDataEntry(base.containerId, "description", text)
+                }
+
+                Label { width: parent.width; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Adhesion Information") }
+
+                ReadOnlyTextArea
+                {
+                    text: properties.adhesion_info;
+                    width: base.firstColumnWidth + base.secondColumnWidth
+                    wrapMode: Text.WordWrap
+
+                    readOnly: !base.editingEnabled;
+
+                    onEditingFinished: Cura.ContainerManager.setContainerMetaDataEntry(base.containerId, "adhesion_info", text)
+                }
+            }
+        }
+    }
+
+    Tab
+    {
+        title: catalog.i18nc("@label", "Print settings")
+        anchors
+        {
+            leftMargin: UM.Theme.getSize("default_margin").width
+            topMargin: UM.Theme.getSize("default_margin").height
+            bottomMargin: UM.Theme.getSize("default_margin").height
+            rightMargin: 0
+        }
+
+        ScrollView
+        {
+            anchors.fill: parent;
+
+            ListView
+            {
+                model: UM.SettingDefinitionsModel
+                {
+                    containerId: Cura.MachineManager.activeDefinitionId
+                    visibilityHandler: Cura.MaterialSettingsVisibilityHandler { }
+                    expanded: ["*"]
+                }
+
+                delegate: UM.TooltipArea
+                {
+                    width: childrenRect.width
+                    height: childrenRect.height
+                    text: model.description
+                    Label
+                    {
+                        id: label
+                        width: base.firstColumnWidth;
+                        height: spinBox.height
+                        text: model.label
+                    }
+                    ReadOnlySpinBox
+                    {
+                        id: spinBox
+                        anchors.left: label.right
+                        value: parseFloat(provider.properties.value);
+                        width: base.secondColumnWidth;
+                        readOnly: !base.editingEnabled
+                        suffix: model.unit
+                        maximumValue: 99999
+                        decimals: model.unit == "mm" ? 2 : 0
+
+                        onEditingFinished: provider.setPropertyValue("value", value)
+                    }
+
+                    UM.ContainerPropertyProvider { id: provider; containerId: base.containerId; watchedProperties: [ "value" ]; key: model.key }
+                }
+            }
+        }
+    }
+}

resources/qml/Preferences/MaterialsPage.qml

@@ -33,6 +33,8 @@ UM.ManagementPage
             }
             return result
         }
+
+        sectionProperty: "brand"
     }
 
     activeId: Cura.MachineManager.activeMaterialId
@@ -45,14 +47,64 @@ UM.ManagementPage
         return -1;
     }
 
-    addEnabled: false
-    removeEnabled: false
-    renameEnabled: false
-
-    scrollviewCaption: " "
+    scrollviewCaption: "Printer: %1, Nozzle: %2".arg(Cura.MachineManager.activeMachineName).arg(Cura.MachineManager.activeVariantName)
     detailsVisible: true
 
-    property string currency: UM.Preferences.getValue("general/currency")
+    section.property: "section"
+    section.delegate: Label { text: section }
+
+    buttons: [
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Activate");
+            iconName: "list-activate";
+            enabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMaterialId
+            onClicked: Cura.MachineManager.setActiveMaterial(base.currentItem.id)
+        },
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Duplicate");
+            iconName: "list-add";
+            enabled: base.currentItem != null
+            onClicked:
+            {
+                var material_id = Cura.ContainerManager.duplicateContainer(base.currentItem.id)
+                if(material_id == "")
+                {
+                    return
+                }
+
+                if(Cura.MachineManager.filterQualityByMachine)
+                {
+                    var quality_id = Cura.ContainerManager.duplicateContainer(Cura.MachineManager.activeQualityId)
+                    Cura.ContainerManager.setContainerMetaDataEntry(quality_id, "material", material_id)
+                    Cura.MachineManager.setActiveQuality(quality_id)
+                }
+
+                Cura.MachineManager.setActiveMaterial(material_id)
+            }
+        },
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Remove");
+            iconName: "list-remove";
+            enabled: base.currentItem != null && !base.currentItem.readOnly
+            onClicked: confirmDialog.open()
+        },
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Import");
+            iconName: "document-import";
+            onClicked: importDialog.open();
+        },
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Export")
+            iconName: "document-export"
+            onClicked: exportDialog.open()
+            enabled: currentItem != null
+        }
+    ]
 
     Item {
         UM.I18nCatalog { id: catalog; name: "cura"; }
@@ -60,126 +112,42 @@ UM.ManagementPage
         visible: base.currentItem != null
         anchors.fill: parent
 
-        Label { id: profileName; text: materialProperties.name; font: UM.Theme.getFont("large"); width: parent.width; }
+        Item
+        {
+            id: profileName
 
-        TabView {
-            id: scrollView
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.top: profileName.bottom
-            anchors.topMargin: UM.Theme.getSize("default_margin").height
-            anchors.bottom: parent.bottom
+            width: parent.width;
+            height: childrenRect.height
 
-            Tab {
-                title: "Information"
-                anchors.margins: UM.Theme.getSize("default_margin").height
+            Label { text: materialProperties.name; font: UM.Theme.getFont("large"); }
+            Button
+            {
+                id: editButton
+                anchors.right: parent.right;
+                text: catalog.i18nc("@action:button", "Edit");
+                iconName: "document-edit";
 
-                Flow {
-                    id: containerGrid
+                enabled: base.currentItem != null && !base.currentItem.readOnly
 
-                    width: scrollView.width;
-                    property real columnWidth: width / 2
-
-                    Label { width: parent.columnWidth; text: catalog.i18nc("@label", "Profile Type") }
-                    Label { width: parent.columnWidth; text: materialProperties.profile_type }
-
-                    Label { width: parent.columnWidth; text: catalog.i18nc("@label", "Supplier") }
-                    Label { width: parent.columnWidth; text: materialProperties.supplier }
-
-                    Label { width: parent.columnWidth; text: catalog.i18nc("@label", "Material Type") }
-                    Label { width: parent.columnWidth; text: materialProperties.material_type }
-
-                    Label { width: parent.columnWidth; text: catalog.i18nc("@label", "Color") }
-
-                    Row {
-                        width: parent.columnWidth;
-                        spacing: UM.Theme.getSize("default_margin").width/2
-                        Rectangle {
-                            color: materialProperties.color_code
-                            width: colorLabel.height
-                            height: colorLabel.height
-                            border.width: UM.Theme.getSize("default_lining").height
-                        }
-                        Label { id: colorLabel; text: materialProperties.color_name }
-                    }
-
-                    Item { width: parent.width; height: UM.Theme.getSize("default_margin").height }
-
-                    Label { width: parent.width; text: "<b>" + catalog.i18nc("@label", "Properties") + "</b>" }
-
-                    Label { width: parent.columnWidth; text: catalog.i18nc("@label", "Density") }
-                    Label { width: parent.columnWidth; text: materialProperties.density }
-
-                    Label { width: parent.columnWidth; text: catalog.i18nc("@label", "Diameter") }
-                    Label { width: parent.columnWidth; text: materialProperties.diameter }
-
-                    Label {
-                        text: catalog.i18nc("@label", "Filament cost")
-                        width: parent.columnWidth;
-                        height: spoolCostInput.height
-                        verticalAlignment: Text.AlignVCenter
-                    }
-
-                    Row {
-                        width: parent.columnWidth;
-                        Label {
-                            text: base.currency ? base.currency + " " : " "
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                        TextField {
-                            id: spoolCostInput
-                            text: materialProperties.spool_cost
-                        }
-                    }
-
-                    Label { width: parent.columnWidth; text: catalog.i18nc("@label", "Filament weight") }
-                    Label { width: parent.columnWidth; text: materialProperties.spool_weight + " " + "g" }
-
-                    Label { width: parent.columnWidth; text: catalog.i18nc("@label", "Filament length") }
-                    Label { width: parent.columnWidth; text: materialProperties.spool_length + " " + "m" }
-
-                    Label { width: parent.columnWidth; text: catalog.i18nc("@label", "Cost per meter") }
-                    Label { width: parent.columnWidth; text: catalog.i18nc("@label", "approx. %1 %2/m").arg(materialProperties.cost_per_meter).arg(base.currency); }
-
-                    Item { width: parent.width; height: UM.Theme.getSize("default_margin").height }
-
-                    Label {
-                        text: materialProperties.description ? "<b>" + catalog.i18nc("@label", "Information") + "</b><br>" + materialProperties.description : "";
-                        width: parent.width
-                        wrapMode: Text.WordWrap
-                    }
-                    Label {
-                        text: materialProperties.adhesion_info ? "<b>" + catalog.i18nc("@label", "Adhesion") + "</b><br>" + materialProperties.adhesion_info : "";
-                        width: parent.width
-                        wrapMode: Text.WordWrap
-                    }
-                }
+                checkable: true
             }
-            Tab {
-                title: catalog.i18nc("@label", "Print settings")
-                anchors.margins: UM.Theme.getSize("default_margin").height
+        }
 
-                Grid {
-                    columns: 2
-                    spacing: UM.Theme.getSize("default_margin").width
-
-                    Column {
-                        Repeater {
-                            model: base.currentItem ? base.currentItem.settings : null
-                            Label {
-                                text: modelData.name.toString();
-                                elide: Text.ElideMiddle;
-                            }
-                        }
-                    }
-                    Column {
-                        Repeater {
-                            model: base.currentItem ? base.currentItem.settings : null
-                            Label { text: modelData.value.toString() + " " + modelData.unit.toString(); }
-                        }
-                    }
-                }
+        MaterialView
+        {
+            anchors
+            {
+                left: parent.left
+                right: parent.right
+                top: profileName.bottom
+                topMargin: UM.Theme.getSize("default_margin").height
+                bottom: parent.bottom
             }
+
+            editingEnabled: base.currentItem != null && !base.currentItem.readOnly && editButton.checked;
+
+            properties: materialProperties
+            containerId: base.currentItem.id
         }
 
         QtObject
@@ -194,17 +162,100 @@ UM.ManagementPage
             property string color_name: "Yellow";
             property color color_code: "yellow";
 
-            property string density: "Unknown";
-            property string diameter: "Unknown";
+            property real density: 0.0;
+            property real diameter: 0.0;
 
-            property string spool_cost: "Unknown";
-            property string spool_weight: "Unknown";
-            property string spool_length: "Unknown";
-            property string cost_per_meter: "Unknown";
+            property real spool_cost: 0.0;
+            property real spool_weight: 0.0;
+            property real spool_length: 0.0;
+            property real cost_per_meter: 0.0;
 
             property string description: "";
             property string adhesion_info: "";
         }
+
+        UM.ConfirmRemoveDialog
+        {
+            id: confirmDialog
+            object: base.currentItem != null ? base.currentItem.name : ""
+            onYes:
+            {
+                var containers = Cura.ContainerManager.findInstanceContainers({"GUID": base.currentItem.metadata.GUID})
+                for(var i in containers)
+                {
+                    Cura.ContainerManager.removeContainer(containers[i])
+                }
+            }
+        }
+
+        FileDialog
+        {
+            id: importDialog;
+            title: catalog.i18nc("@title:window", "Import Material");
+            selectExisting: true;
+            nameFilters: Cura.ContainerManager.getContainerNameFilters("material")
+            folder: CuraApplication.getDefaultPath()
+            onAccepted:
+            {
+                var result = Cura.ContainerManager.importContainer(fileUrl)
+
+                messageDialog.title = catalog.i18nc("@title:window", "Import Material")
+                messageDialog.text = catalog.i18nc("@info:status", "Could not import material <filename>%1</filename>: <message>%2</message>").arg(fileUrl).arg(result.message)
+                if(result.status == "success")
+                {
+                    messageDialog.icon = StandardIcon.Information
+                    messageDialog.text = catalog.i18nc("@info:status", "Successfully imported material <filename>%1</filename>").arg(fileUrl)
+                }
+                else if(result.status == "duplicate")
+                {
+                    messageDialog.icon = StandardIcon.Warning
+                }
+                else
+                {
+                    messageDialog.icon = StandardIcon.Critical
+                }
+                messageDialog.open()
+            }
+        }
+
+        FileDialog
+        {
+            id: exportDialog;
+            title: catalog.i18nc("@title:window", "Export Material");
+            selectExisting: false;
+            nameFilters: Cura.ContainerManager.getContainerNameFilters("material")
+            folder: CuraApplication.getDefaultPath()
+            onAccepted:
+            {
+                if(base.currentItem.metadata.base_file)
+                {
+                    var result = Cura.ContainerManager.exportContainer(base.currentItem.metadata.base_file, selectedNameFilter, fileUrl)
+                }
+                else
+                {
+                    var result = Cura.ContainerManager.exportContainer(base.currentItem.id, selectedNameFilter, fileUrl)
+                }
+
+                messageDialog.title = catalog.i18nc("@title:window", "Export Material")
+                if(result.status == "error")
+                {
+                    messageDialog.icon = StandardIcon.Critical
+                    messageDialog.text = catalog.i18nc("@info:status", "Failed to export material to <filename>%1</filename>: <message>%2</message>").arg(fileUrl).arg(result.message)
+                    messageDialog.open()
+                }
+                else if(result.status == "success")
+                {
+                    messageDialog.icon = StandardIcon.Information
+                    messageDialog.text = catalog.i18nc("@info:status", "Successfully exported material to <filename>%1</filename>").arg(fileUrl)
+                    messageDialog.open()
+                }
+            }
+        }
+
+        MessageDialog
+        {
+            id: messageDialog
+        }
     }
 
     onCurrentItemChanged:
@@ -228,13 +279,13 @@ UM.ManagementPage
 
             if(currentItem.metadata.properties != undefined && currentItem.metadata.properties != null)
             {
-                materialProperties.density = currentItem.metadata.properties.density ? currentItem.metadata.properties.density : "Unknown";
-                materialProperties.diameter = currentItem.metadata.properties.diameter ? currentItem.metadata.properties.diameter : "Unknown";
+                materialProperties.density = currentItem.metadata.properties.density ? currentItem.metadata.properties.density : 0.0;
+                materialProperties.diameter = currentItem.metadata.properties.diameter ? currentItem.metadata.properties.diameter : 0.0;
             }
             else
             {
-                materialProperties.density = "Unknown";
-                materialProperties.diameter = "Unknown";
+                materialProperties.density = 0.0;
+                materialProperties.diameter = 0.0;
             }
         }
     }

resources/qml/Preferences/ProfilesPage.qml

@@ -13,7 +13,6 @@ UM.ManagementPage
     id: base;
 
     title: catalog.i18nc("@title:tab", "Profiles");
-    addText: base.currentItem && (base.currentItem.id == Cura.MachineManager.activeQualityId) ? catalog.i18nc("@label", "Create") : catalog.i18nc("@label", "Duplicate")
 
     model: UM.InstanceContainersModel
     {
@@ -60,27 +59,62 @@ UM.ManagementPage
         return -1;
     }
 
-    onActivateObject: Cura.MachineManager.setActiveQuality(currentItem.id)
-    onAddObject: {
-        var selectedContainer;
-        if (objectList.currentItem.id == Cura.MachineManager.activeQualityId) {
-            selectedContainer = Cura.MachineManager.newQualityContainerFromQualityAndUser();
-        } else {
-            selectedContainer = Cura.MachineManager.duplicateContainer(base.currentItem.id);
+    buttons: [
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Activate");
+            iconName: "list-activate";
+            enabled: base.currentItem != null ? base.currentItem.id != Cura.MachineManager.activeQualityId : false;
+            onClicked: Cura.MachineManager.setActiveQuality(base.currentItem.id)
+        },
+        Button
+        {
+            text: base.currentItem && (base.currentItem.id == Cura.MachineManager.activeQualityId) ? catalog.i18nc("@label", "Create") : catalog.i18nc("@label", "Duplicate")
+            iconName: "list-add";
+
+            onClicked:
+            {
+                var selectedContainer;
+                if (objectList.currentItem.id == Cura.MachineManager.activeQualityId) {
+                    selectedContainer = Cura.MachineManager.newQualityContainerFromQualityAndUser();
+                } else {
+                    selectedContainer = Cura.MachineManager.duplicateContainer(base.currentItem.id);
+                }
+                base.selectContainer(selectedContainer);
+
+                renameDialog.removeWhenRejected = true;
+                renameDialog.open();
+                renameDialog.selectText();
+            }
+        },
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Remove");
+            iconName: "list-remove";
+            enabled: base.currentItem != null ? !base.currentItem.readOnly : false;
+            onClicked: confirmDialog.open();
+        },
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Rename");
+            iconName: "edit-rename";
+            enabled: base.currentItem != null ? !base.currentItem.readOnly : false;
+            onClicked: { renameDialog.removeWhenRejected = false; renameDialog.open(); renameDialog.selectText(); }
+        },
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Import");
+            iconName: "document-import";
+            onClicked: importDialog.open();
+        },
+        Button
+        {
+            text: catalog.i18nc("@action:button", "Export")
+            iconName: "document-export"
+            onClicked: exportDialog.open()
+            enabled: currentItem != null
         }
-        base.selectContainer(selectedContainer);
-
-        renameDialog.removeWhenRejected = true;
-        renameDialog.open();
-        renameDialog.selectText();
-    }
-    onRemoveObject: confirmDialog.open();
-    onRenameObject: { renameDialog.removeWhenRejected = false; renameDialog.open(); renameDialog.selectText(); }
-
-    activateEnabled: currentItem != null ? currentItem.id != Cura.MachineManager.activeQualityId : false;
-    addEnabled: currentItem != null;
-    removeEnabled: currentItem != null ? !currentItem.readOnly : false;
-    renameEnabled: currentItem != null ? !currentItem.readOnly : false;
+    ]
 
     scrollviewCaption: catalog.i18nc("@label %1 is printer name","Printer: %1").arg(Cura.MachineManager.activeMachineName)
 
@@ -211,24 +245,6 @@ UM.ManagementPage
         }
     }
 
-    buttons: Row {
-
-        Button
-        {
-            text: catalog.i18nc("@action:button", "Import");
-            iconName: "document-import";
-            onClicked: importDialog.open();
-        }
-
-        Button
-        {
-            text: catalog.i18nc("@action:button", "Export")
-            iconName: "document-export"
-            onClicked: exportDialog.open()
-            enabled: currentItem != null
-        }
-    }
-
     Item
     {
         UM.I18nCatalog { id: catalog; name: "uranium"; }

resources/qml/Preferences/ReadOnlySpinBox.qml

@@ -0,0 +1,52 @@
+// Copyright (c) 2016 Ultimaker B.V.
+// Uranium is released under the terms of the AGPLv3 or higher.
+
+import QtQuick 2.1
+import QtQuick.Controls 1.1
+import QtQuick.Dialogs 1.2
+
+Item
+{
+    id: base
+
+    property alias value: spinBox.value
+    property alias minimumValue: spinBox.minimumValue
+    property alias maximumValue: spinBox.maximumValue
+    property alias stepSize: spinBox.stepSize
+    property alias prefix: spinBox.prefix
+    property alias suffix: spinBox.suffix
+    property alias decimals: spinBox.decimals
+
+    signal editingFinished();
+
+    property bool readOnly: false
+
+    width: spinBox.width
+    height: spinBox.height
+
+    SpinBox
+    {
+        id: spinBox
+
+        enabled: !base.readOnly
+        opacity: base.readOnly ? 0.5 : 1.0
+
+        anchors.fill: parent
+
+        onEditingFinished: base.editingFinished()
+    }
+
+    Label
+    {
+        visible: base.readOnly
+        text: base.prefix + base.value.toFixed(spinBox.decimals) + base.suffix
+
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.left: parent.left
+        anchors.leftMargin: spinBox.__style ? spinBox.__style.padding.left : 0
+
+        color: palette.buttonText
+    }
+
+    SystemPalette { id: palette }
+}

resources/qml/Preferences/ReadOnlyTextArea.qml

@@ -0,0 +1,46 @@
+// Copyright (c) 2016 Ultimaker B.V.
+// Uranium is released under the terms of the AGPLv3 or higher.
+
+import QtQuick 2.1
+import QtQuick.Controls 1.1
+import QtQuick.Dialogs 1.2
+
+Item
+{
+    id: base
+
+    property alias text: textArea.text
+    property alias wrapMode: textArea.wrapMode
+
+    signal editingFinished();
+
+    property bool readOnly: false
+
+    width: textArea.width
+    height: textArea.height
+
+    TextArea
+    {
+        id: textArea
+
+        enabled: !base.readOnly
+        opacity: base.readOnly ? 0.5 : 1.0
+
+        anchors.fill: parent
+
+        onEditingFinished: base.editingFinished()
+    }
+
+    Label
+    {
+        visible: base.readOnly
+        text: textArea.text
+
+        anchors.fill: parent
+        anchors.margins: textArea.__style ? textArea.__style.textMargin : 4
+
+        color: palette.buttonText
+    }
+
+    SystemPalette { id: palette }
+}

resources/qml/Preferences/ReadOnlyTextField.qml

@@ -0,0 +1,46 @@
+// Copyright (c) 2016 Ultimaker B.V.
+// Uranium is released under the terms of the AGPLv3 or higher.
+
+import QtQuick 2.1
+import QtQuick.Controls 1.1
+import QtQuick.Dialogs 1.2
+
+Item
+{
+    id: base
+
+    property alias text: textField.text
+
+    signal editingFinished();
+
+    property bool readOnly: false
+
+    width: textField.width
+    height: textField.height
+
+    TextField
+    {
+        id: textField
+
+        enabled: !base.readOnly
+        opacity: base.readOnly ? 0.5 : 1.0
+
+        anchors.fill: parent
+
+        onEditingFinished: base.editingFinished()
+    }
+
+    Label
+    {
+        visible: base.readOnly
+        text: textField.text
+
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.left: parent.left
+        anchors.leftMargin: textField.__panel ? textField.__panel.leftMargin : 0
+
+        color: palette.buttonText
+    }
+
+    SystemPalette { id: palette }
+}