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

Rearrange and align time/material estimates

Browse Source 
They look correct now but the log says there is a binding loop in here. We'll fix that next.

Contributes to issue CURA-4149.
This commit is contained in:
Ghostkeeper 2017-08-14 09:23:56 +02:00
parent fb3a0b701c
commit c4305c7b1e
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
1 changed files with 89 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
resources/qml/Sidebar.qml
View File

@ -403,16 +403,28 @@ Rectangle
Rectangle Rectangle
{ {
id: specsRow id: printSpecs
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.bottomMargin: UM.Theme.getSize("default_margin").height anchors.bottomMargin: UM.Theme.getSize("default_margin").height
height: UM.Theme.getSize("jobspecs_line").height
Rectangle
{
id: timeSpecsRow
anchors.left: parent.left
anchors.bottom: filamentSpecsRow.top
width: childrenRect.width
height: childrenRect.height
UM.TooltipArea UM.TooltipArea
{ {
id: timeSpecPerFeatureTooltipArea id: timeSpecPerFeatureTooltipArea
width: childrenRect.width
height: childrenRect.height
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
text: { text: {
var order = ["inset_0", "inset_x", "skin", "infill", "support_infill", "support_interface", "support", "travel", "retract", "none"]; var order = ["inset_0", "inset_x", "skin", "infill", "support_infill", "support_interface", "support", "travel", "retract", "none"];
var visible_names = { var visible_names = {
@ -439,54 +451,30 @@ Rectangle
result = result.replace(/^\<br\/\>/, ""); // remove newline before first item result = result.replace(/^\<br\/\>/, ""); // remove newline before first item
return result; return result;
} }
width: childrenRect.width
height: childrenRect.height
anchors.right: lengthIcon.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.verticalCenter
UM.RecolorImage
{
id: timeIcon
anchors.left: parent.left
anchors.top: parent.top
anchors.verticalCenter: parent.verticalCenter
width: UM.Theme.getSize("save_button_specs_icons").width
height: UM.Theme.getSize("save_button_specs_icons").height
sourceSize.width: width
sourceSize.height: width
color: UM.Theme.getColor("text_subtext")
source: UM.Theme.getIcon("print_time")
}
Text Text
{ {
id: timeSpec id: timeSpec
anchors.left: timeIcon.right anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width / 2 anchors.bottom: parent.bottom
anchors.top: parent.top
font: UM.Theme.getFont("small") font: UM.Theme.getFont("small")
color: UM.Theme.getColor("text_subtext") color: UM.Theme.getColor("text_subtext")
text: (!base.printDuration || !base.printDuration.valid) ? catalog.i18nc("@label", "00h 00min") : base.printDuration.getDisplayString(UM.DurationFormat.Short) text: (!base.printDuration || !base.printDuration.valid) ? catalog.i18nc("@label", "00h 00min") : base.printDuration.getDisplayString(UM.DurationFormat.Short)
} }
} }
UM.RecolorImage
{
id: lengthIcon
anchors.right: lengthSpec.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width/2
anchors.verticalCenter: parent.verticalCenter
width: UM.Theme.getSize("save_button_specs_icons").width
height: UM.Theme.getSize("save_button_specs_icons").height
sourceSize.width: width
sourceSize.height: width
color: UM.Theme.getColor("text_subtext")
source: UM.Theme.getIcon("category_material")
} }
Rectangle
{
id: filamentSpecsRow
anchors.left: parent.left
anchors.bottom: parent.bottom
width: childrenRect.width
height: childrenRect.height
Text Text
{ {
id: lengthSpec id: lengthSpec
anchors.right: parent.right anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
font: UM.Theme.getFont("small") font: UM.Theme.getFont("small")
color: UM.Theme.getColor("text_subtext") color: UM.Theme.getColor("text_subtext")
@ -530,6 +518,7 @@ Rectangle
} }
} }
} }
}
// SaveButton and MonitorButton are actually the bottom footer panels. // SaveButton and MonitorButton are actually the bottom footer panels.
// "!monitoringPrint" currently means "show-settings-mode" // "!monitoringPrint" currently means "show-settings-mode"