GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 01:49:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Align the print info to the left

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-12-05 14:22:04 +01:00
parent a2587aca59
commit 218fa3aded
2 changed files with 71 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
resources/qml/Cura.qml
View File

@ -189,16 +189,6 @@ UM.MainWindow
onHideTooltip: base.hideTooltip()
}
JobSpecs
{
id: jobSpecs
anchors
{
bottom: parent.bottom
bottomMargin: UM.Theme.getSize("default_margin").height
}
}
Toolbar
{
// The toolbar is the left bar that is populated by all the tools (which are dynamicly populated by
@ -228,6 +218,19 @@ UM.MainWindow
}
}
JobSpecs
{
id: jobSpecs
visible: CuraApplication.platformActivity
anchors
{
left: parent.left
bottom: viewOrientationControls.top
margins: UM.Theme.getSize("wide_margin").width
bottomMargin: UM.Theme.getSize("default_margin").width
}
}
ViewOrientationControls
{
id: viewOrientationControls
@ -235,9 +238,8 @@ UM.MainWindow
anchors
{
left: parent.left
margins: UM.Theme.getSize("default_margin").width
bottom: parent.bottom
margins: UM.Theme.getSize("wide_margin").width
}
}

36
resources/qml/JobSpecs.qml
View File

@ -19,9 +19,10 @@ Item
UM.I18nCatalog
{
id: catalog
name:"cura"
name: "cura"
}
width: childrenRect.width
height: childrenRect.height
onActivityChanged:
@ -33,23 +34,17 @@ Item
}
}
Rectangle
Item
{
id: jobNameRow
anchors.top: parent.top
anchors.right: parent.right
anchors.left: parent.left
height: UM.Theme.getSize("jobspecs_line").height
visible: base.activity
Item
{
width: parent.width
height: parent.height
Button
{
id: printJobPencilIcon
anchors.right: parent.right
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
width: UM.Theme.getSize("save_button_specs_icons").width
height: UM.Theme.getSize("save_button_specs_icons").height
@ -80,14 +75,14 @@ Item
TextField
{
id: printJobTextfield
anchors.right: printJobPencilIcon.left
anchors.rightMargin: UM.Theme.getSize("narrow_margin").width
anchors.left: printJobPencilIcon.right
anchors.leftMargin: UM.Theme.getSize("narrow_margin").width
height: UM.Theme.getSize("jobspecs_line").height
width: Math.max(__contentWidth + UM.Theme.getSize("default_margin").width, 50)
maximumLength: 120
property int unremovableSpacing: 5
text: PrintInformation.jobName
horizontalAlignment: TextInput.AlignRight
horizontalAlignment: TextInput.AlignLeft
onEditingFinished:
{
@ -112,28 +107,21 @@ Item
}
}
}
}
Row
{
id: additionalComponentsRow
anchors.top: jobNameRow.bottom
anchors.right: parent.right
anchors.left: parent.left
}
Label
{
id: boundingSpec
anchors.top: jobNameRow.bottom
anchors.right: additionalComponentsRow.left
anchors.rightMargin:
{
if (additionalComponentsRow.width > 0)
{
return UM.Theme.getSize("default_margin").width
}
return 0
}
anchors.left: additionalComponentsRow.right
anchors.leftMargin: additionalComponentsRow.width > 0 ? UM.Theme.getSize("default_margin").width : 0
height: UM.Theme.getSize("jobspecs_line").height
verticalAlignment: Text.AlignVCenter
font: UM.Theme.getFont("default_bold")