3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update MonitorPrintJobProgressBar.qml

Browse source 
Contributes to CL-1150
This commit is contained in:
Ian Paschal 2018-11-27 10:54:46 +01:00
parent 616ec13457
commit 8965695a59
1 changed files with 112 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

154
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml
View file

@ -6,107 +6,129 @@ import QtQuick.Controls.Styles 1.3
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import UM 1.3 as UM import UM 1.3 as UM
ProgressBar /**
* NOTE: For most labels, a fixed height with vertical alignment is used to make
* layouts more deterministic (like the fixed-size textboxes used in original
* mock-ups). This is also a stand-in for CSS's 'line-height' property. Denoted
* with '// FIXED-LINE-HEIGHT:'.
*/
Item
{ {
id: base
property var printJob: null property var printJob: null
property var progress: { property var progress:
{
if (!printJob)
{
return 0
}
var result = printJob.timeElapsed / printJob.timeTotal
if (result > 1.0)
{
result = 1.0
}
return result
}
property var remainingTime:
{
if (!printJob) { if (!printJob) {
return 0; return 0
}
var result = printJob.timeElapsed / printJob.timeTotal;
if (result > 1.0) {
result = 1.0;
}
return result;
}
width: 180 * screenScaleFactor // TODO: Theme!
value: progress;
style: ProgressBarStyle {
property var remainingTime: {
if (!printJob) {
return 0;
} }
/* Sometimes total minus elapsed is less than 0. Use Math.max() to prevent remaining /* Sometimes total minus elapsed is less than 0. Use Math.max() to prevent remaining
time from ever being less than 0. Negative durations cause strange behavior such time from ever being less than 0. Negative durations cause strange behavior such
as displaying "-1h -1m". */ as displaying "-1h -1m". */
return Math.max(printer.activePrintJob.timeTotal - printer.activePrintJob.timeElapsed, 0); return Math.max(printer.activePrintJob.timeTotal - printer.activePrintJob.timeElapsed, 0)
} }
property var progressText: { property var progressText:
if (!printJob) { {
if (!printJob)
{
return ""; return "";
} }
switch (printJob.state) { switch (printJob.state)
{
case "wait_cleanup": case "wait_cleanup":
if (printJob.timeTotal > printJob.timeElapsed) { if (printJob.timeTotal > printJob.timeElapsed)
return catalog.i18nc("@label:status", "Aborted"); {
return catalog.i18nc("@label:status", "Aborted")
} }
return catalog.i18nc("@label:status", "Finished"); return catalog.i18nc("@label:status", "Finished")
case "pre_print": case "pre_print":
case "sent_to_printer": case "sent_to_printer":
return catalog.i18nc("@label:status", "Preparing"); return catalog.i18nc("@label:status", "Preparing")
case "aborted": case "aborted":
return catalog.i18nc("@label:status", "Aborted"); return catalog.i18nc("@label:status", "Aborted")
case "wait_user_action": case "wait_user_action":
return catalog.i18nc("@label:status", "Aborted"); return catalog.i18nc("@label:status", "Aborted")
case "pausing": case "pausing":
return catalog.i18nc("@label:status", "Pausing"); return catalog.i18nc("@label:status", "Pausing")
case "paused": case "paused":
return OutputDevice.formatDuration( remainingTime ); return OutputDevice.formatDuration( remainingTime )
case "resuming": case "resuming":
return catalog.i18nc("@label:status", "Resuming"); return catalog.i18nc("@label:status", "Resuming")
case "queued": case "queued":
return catalog.i18nc("@label:status", "Action required"); return catalog.i18nc("@label:status", "Action required")
default: default:
return OutputDevice.formatDuration( remainingTime ); return OutputDevice.formatDuration( remainingTime )
} }
} }
background: Rectangle { width: childrenRect.width
height: 18 * screenScaleFactor // TODO: Theme!
ProgressBar
{
id: progressBar
anchors
{
verticalCenter: parent.verticalCenter
}
value: progress;
style: ProgressBarStyle
{
background: Rectangle
{
color: "#e4e4f2" // TODO: Theme! color: "#e4e4f2" // TODO: Theme!
implicitHeight: visible ? 8 : 0; implicitHeight: visible ? 8 * screenScaleFactor : 0 // TODO: Theme!
implicitWidth: 180; implicitWidth: 180 * screenScaleFactor // TODO: Theme!
radius: 4 radius: 4 * screenScaleFactor // TODO: Theme!
} }
progress: Rectangle { progress: Rectangle
{
id: progressItem; id: progressItem;
color: { color:
if (!printJob) { {
return "black";
}
var state = printJob.state var state = printJob.state
var inactiveStates = [ var inactiveStates = [
"pausing", "pausing",
"paused", "paused",
"resuming", "resuming",
"wait_cleanup" "wait_cleanup"
]; ]
if (inactiveStates.indexOf(state) > -1 && remainingTime > 0) { if (inactiveStates.indexOf(state) > -1 && remainingTime > 0)
return UM.Theme.getColor("monitor_progress_fill_inactive"); {
} else { return UM.Theme.getColor("monitor_progress_fill_inactive")
}
return "#0a0850" // TODO: Theme! return "#0a0850" // TODO: Theme!
} }
radius: 4 * screenScaleFactor // TODO: Theme!
} }
radius: 4 }
}
Label
{
id: progressLabel
anchors
{
left: progressBar.right
leftMargin: 18 * screenScaleFactor // TODO: Theme!
}
text: progressText
color: "#374355" // TODO: Theme!
width: contentWidth
font: UM.Theme.getFont("medium") // 14pt, regular
Label { // FIXED-LINE-HEIGHT:
id: progressLabel; height: 18 * screenScaleFactor // TODO: Theme!
anchors { verticalAlignment: Text.AlignVCenter
left: parent.left;
leftMargin: getTextOffset();
}
text: progressText;
anchors.verticalCenter: parent.verticalCenter;
color: progressItem.width + progressLabel.width < control.width ? UM.Theme.getColor("text") : UM.Theme.getColor("monitor_progress_fill_text");
width: contentWidth;
font: UM.Theme.getFont("default");
}
function getTextOffset() {
if (progressItem.width + progressLabel.width + 16 < control.width) {
return progressItem.width + UM.Theme.getSize("default_margin").width;
} else {
return progressItem.width - progressLabel.width - UM.Theme.getSize("default_margin").width;
}
}
}
} }
} }