Updated labels

This commit is contained in:
Jaime van Kessel 2018-08-23 18:16:39 +02:00
parent c703d15cd3
commit e9d4c36b32
2 changed files with 11 additions and 28 deletions

View file

@ -39,7 +39,7 @@ Component
right: parent.right right: parent.right
} }
text: OutputDevice.name text: catalog.i18nc("@label", "Printing")
elide: Text.ElideRight elide: Text.ElideRight
} }

View file

@ -40,34 +40,16 @@ Component
visible: OutputDevice.printers.length == 0 visible: OutputDevice.printers.length == 0
} }
Item
{
anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
width: Math.min(800 * screenScaleFactor, maximumWidth)
height: children.height
visible: OutputDevice.printers.length != 0
Label Label
{ {
id: addRemovePrintersLabel id: queuedLabel
anchors.right: parent.right anchors.left: queuedPrintJobs.left
text: catalog.i18nc("@label link to connect manager", "Add/Remove printers") anchors.top: parent.top
font: UM.Theme.getFont("default") anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height
anchors.leftMargin: 3 * UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@label", "Queued")
font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link")
}
MouseArea
{
anchors.fill: addRemovePrintersLabel
hoverEnabled: true
onClicked: Cura.MachineManager.printerOutputDevices[0].openPrinterControlPanel()
onEntered: addRemovePrintersLabel.font.underline = true
onExited: addRemovePrintersLabel.font.underline = false
}
} }
ScrollView ScrollView
@ -77,7 +59,8 @@ Component
anchors anchors
{ {
margins: UM.Theme.getSize("default_margin").width margins: UM.Theme.getSize("default_margin").width
top: activePrintersLabel.bottom top: queuedLabel.bottom
topMargin: 0
left: parent.left left: parent.left
bottomMargin: 0 bottomMargin: 0
right: parent.right right: parent.right