Merge remote-tracking branch 'origin/3.6'

This commit is contained in:
Lipu Fei 2018-11-08 15:28:42 +01:00
commit 369747d106

View file

@ -168,6 +168,18 @@ Item {
width: 0.5 * printJobPreview.width;
}
}
Label {
id: totalTimeLabel;
anchors {
bottom: parent.bottom;
right: parent.right;
}
color: UM.Theme.getColor("text");
elide: Text.ElideRight;
font: UM.Theme.getFont("default");
text: printJob ? OutputDevice.formatDuration(printJob.timeTotal) : "";
}
}
// Divider