Rearrange MachineActions on Machines page

CURA-1385
This commit is contained in:
fieldOfView 2016-06-23 13:43:50 +02:00
parent 19412c5bda
commit 0faecf9b34

View File

@ -36,13 +36,27 @@ UM.ManagementPage
renameEnabled: base.currentItem != null renameEnabled: base.currentItem != null
activateEnabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMachineId activateEnabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMachineId
Flow Item
{ {
anchors.fill: parent; visible: base.currentItem != null
spacing: UM.Theme.getSize("default_margin").height; anchors.fill: parent
Label
{
id: machineName
text: base.currentItem && base.currentItem.name ? base.currentItem.name : ""
font: UM.Theme.getFont("large")
width: parent.width
elide: Text.ElideRight
}
Row Row
{ {
id: machineActions
anchors.left: parent.left
anchors.top: machineName.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height
Repeater Repeater
{ {
id: machineActionRepeater id: machineActionRepeater
@ -72,16 +86,18 @@ UM.ManagementPage
} }
} }
Label Row
{ {
text: base.currentItem && base.currentItem.name ? base.currentItem.name : "" anchors.top: machineActions.visible ? machineActions.bottom : machineActions.anchors.top
font: UM.Theme.getFont("large") anchors.topMargin: UM.Theme.getSize("default_margin").height
width: parent.width anchors.left: parent.left
elide: Text.ElideRight anchors.right: parent.right
}
Label { text: catalog.i18nc("@label", "Type"); width: parent.width * 0.2; } spacing: UM.Theme.getSize("default_margin").height
Label { text: base.currentItem && base.currentItem.typeName ? base.currentItem.typeName : ""; width: parent.width * 0.7; }
Label { text: catalog.i18nc("@label", "Type") }
Label { text: base.currentItem ? base.currentItem.metadata.definition_name : "" }
}
UM.I18nCatalog { id: catalog; name: "uranium"; } UM.I18nCatalog { id: catalog; name: "uranium"; }