mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-04-23 22:29:41 +08:00
Rework printer cards
Contributes to CL-1051
This commit is contained in:
Ian Paschal
parent
fc333d53c5
commit
b5c893c08e
@ -66,12 +66,38 @@ Component
|
||||
onExited: managePrintersLabel.font.underline = false
|
||||
}
|
||||
|
||||
// Skeleton loading
|
||||
Column
|
||||
{
|
||||
id: dummies
|
||||
anchors
|
||||
{
|
||||
top: printingLabel.bottom
|
||||
topMargin: UM.Theme.getSize("default_margin").height
|
||||
left: parent.left
|
||||
leftMargin: UM.Theme.getSize("wide_margin").width
|
||||
right: parent.right
|
||||
rightMargin: UM.Theme.getSize("wide_margin").width
|
||||
}
|
||||
spacing: UM.Theme.getSize("default_margin").height - 10
|
||||
|
||||
PrinterCard
|
||||
{
|
||||
printer: null
|
||||
}
|
||||
PrinterCard
|
||||
{
|
||||
printer: null
|
||||
}
|
||||
}
|
||||
|
||||
// Actual content
|
||||
ScrollView
|
||||
{
|
||||
id: printerScrollView
|
||||
anchors
|
||||
{
|
||||
top: printingLabel.bottom
|
||||
top: dummies.bottom
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
topMargin: UM.Theme.getSize("default_margin").height
|
||||
@ -83,720 +109,19 @@ Component
|
||||
|
||||
ListView
|
||||
{
|
||||
id: printer_list
|
||||
property var current_index: -1
|
||||
id: printerList
|
||||
property var currentIndex: -1
|
||||
anchors
|
||||
{
|
||||
top: parent.top
|
||||
bottom: parent.bottom
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
leftMargin: 2 * UM.Theme.getSize("default_margin").width
|
||||
rightMargin: 2 * UM.Theme.getSize("default_margin").width
|
||||
fill: parent
|
||||
leftMargin: UM.Theme.getSize("wide_margin").width
|
||||
rightMargin: UM.Theme.getSize("wide_margin").width
|
||||
}
|
||||
spacing: UM.Theme.getSize("default_margin").height -10
|
||||
spacing: UM.Theme.getSize("default_margin").height - 10
|
||||
model: OutputDevice.printers
|
||||
|
||||
delegate: Item
|
||||
delegate: PrinterCard
|
||||
{
|
||||
width: parent.width
|
||||
height: base.height + 2 * base.shadowRadius // To ensure that the shadow doesn't get cut off.
|
||||
Rectangle
|
||||
{
|
||||
width: parent.width - 2 * shadowRadius
|
||||
height: childrenRect.height + UM.Theme.getSize("default_margin").height
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
color:
|
||||
{
|
||||
if(modelData.state == "disabled")
|
||||
{
|
||||
return UM.Theme.getColor("monitor_tab_background_inactive")
|
||||
}
|
||||
else
|
||||
{
|
||||
return UM.Theme.getColor("monitor_tab_background_active")
|
||||
}
|
||||
}
|
||||
id: base
|
||||
property var shadowRadius: 5 * screenScaleFactor
|
||||
property var collapsed: true
|
||||
|
||||
layer.enabled: true
|
||||
layer.effect: DropShadow
|
||||
{
|
||||
radius: 5 * screenScaleFactor
|
||||
verticalOffset: 2
|
||||
color: "#3F000000" // 25% shadow
|
||||
}
|
||||
|
||||
Connections
|
||||
{
|
||||
target: printer_list
|
||||
onCurrent_indexChanged: { base.collapsed = printer_list.current_index != model.index }
|
||||
}
|
||||
|
||||
Item
|
||||
{
|
||||
id: printerInfo
|
||||
height: machineIcon.height
|
||||
anchors
|
||||
{
|
||||
top: parent.top
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
margins: UM.Theme.getSize("default_margin").width
|
||||
}
|
||||
|
||||
MouseArea
|
||||
{
|
||||
anchors.fill: parent
|
||||
onClicked:
|
||||
{
|
||||
if (base.collapsed) {
|
||||
printer_list.current_index = model.index
|
||||
}
|
||||
else
|
||||
{
|
||||
printer_list.current_index = -1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Item
|
||||
{
|
||||
id: machineIcon
|
||||
// Yeah, this is hardcoded now, but I can't think of a good way to fix this.
|
||||
// The UI is going to get another update soon, so it's probably not worth the effort...
|
||||
width: 58
|
||||
height: 58
|
||||
anchors.top: parent.top
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.left: parent.left
|
||||
|
||||
UM.RecolorImage
|
||||
{
|
||||
anchors.centerIn: parent
|
||||
source:
|
||||
{
|
||||
switch(modelData.type)
|
||||
{
|
||||
case "Ultimaker 3":
|
||||
return "../svg/UM3-icon.svg"
|
||||
case "Ultimaker 3 Extended":
|
||||
return "../svg/UM3x-icon.svg"
|
||||
case "Ultimaker S5":
|
||||
return "../svg/UMs5-icon.svg"
|
||||
}
|
||||
}
|
||||
width: sourceSize.width
|
||||
height: sourceSize.height
|
||||
|
||||
color:
|
||||
{
|
||||
if(modelData.state == "disabled")
|
||||
{
|
||||
return UM.Theme.getColor("monitor_tab_text_inactive")
|
||||
}
|
||||
|
||||
if(modelData.activePrintJob != undefined)
|
||||
{
|
||||
return UM.Theme.getColor("primary")
|
||||
}
|
||||
|
||||
return UM.Theme.getColor("monitor_tab_text_inactive")
|
||||
}
|
||||
}
|
||||
}
|
||||
Item
|
||||
{
|
||||
height: childrenRect.height
|
||||
anchors
|
||||
{
|
||||
right: collapseIcon.left
|
||||
rightMargin: UM.Theme.getSize("default_margin").width
|
||||
left: machineIcon.right
|
||||
leftMargin: UM.Theme.getSize("default_margin").width
|
||||
|
||||
verticalCenter: machineIcon.verticalCenter
|
||||
}
|
||||
|
||||
Label
|
||||
{
|
||||
id: machineNameLabel
|
||||
text: modelData.name
|
||||
width: parent.width
|
||||
elide: Text.ElideRight
|
||||
font: UM.Theme.getFont("default_bold")
|
||||
}
|
||||
|
||||
Label
|
||||
{
|
||||
id: activeJobLabel
|
||||
text:
|
||||
{
|
||||
if (modelData.state == "disabled")
|
||||
{
|
||||
return catalog.i18nc("@label", "Not available")
|
||||
} else if (modelData.state == "unreachable")
|
||||
{
|
||||
return catalog.i18nc("@label", "Unreachable")
|
||||
}
|
||||
if (modelData.activePrintJob != null)
|
||||
{
|
||||
return modelData.activePrintJob.name
|
||||
}
|
||||
return catalog.i18nc("@label", "Available")
|
||||
}
|
||||
anchors.top: machineNameLabel.bottom
|
||||
width: parent.width
|
||||
elide: Text.ElideRight
|
||||
font: UM.Theme.getFont("default")
|
||||
color: UM.Theme.getColor("monitor_tab_text_inactive")
|
||||
}
|
||||
}
|
||||
|
||||
UM.RecolorImage
|
||||
{
|
||||
id: collapseIcon
|
||||
width: 15
|
||||
height: 15
|
||||
sourceSize.width: width
|
||||
sourceSize.height: height
|
||||
source: base.collapsed ? UM.Theme.getIcon("arrow_left") : UM.Theme.getIcon("arrow_bottom")
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
color: "black"
|
||||
}
|
||||
}
|
||||
|
||||
Item
|
||||
{
|
||||
id: detailedInfo
|
||||
property var printJob: modelData.activePrintJob
|
||||
visible: height == childrenRect.height
|
||||
anchors.top: printerInfo.bottom
|
||||
width: parent.width
|
||||
height: !base.collapsed ? childrenRect.height : 0
|
||||
opacity: visible ? 1 : 0
|
||||
Behavior on height { NumberAnimation { duration: 100 } }
|
||||
Behavior on opacity { NumberAnimation { duration: 100 } }
|
||||
Rectangle
|
||||
{
|
||||
id: topSpacer
|
||||
color:
|
||||
{
|
||||
if(modelData.state == "disabled")
|
||||
{
|
||||
return UM.Theme.getColor("monitor_lining_inactive")
|
||||
}
|
||||
return UM.Theme.getColor("viewport_background")
|
||||
}
|
||||
// UM.Theme.getColor("viewport_background")
|
||||
height: 1
|
||||
anchors
|
||||
{
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
margins: UM.Theme.getSize("default_margin").width
|
||||
top: parent.top
|
||||
topMargin: UM.Theme.getSize("default_margin").width
|
||||
}
|
||||
}
|
||||
PrinterFamilyPill
|
||||
{
|
||||
id: printerFamilyPill
|
||||
color:
|
||||
{
|
||||
if(modelData.state == "disabled")
|
||||
{
|
||||
return "transparent"
|
||||
}
|
||||
return UM.Theme.getColor("viewport_background")
|
||||
}
|
||||
anchors.top: topSpacer.bottom
|
||||
anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height
|
||||
text: modelData.type
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
padding: 3
|
||||
}
|
||||
Row
|
||||
{
|
||||
id: extrudersInfo
|
||||
anchors.top: printerFamilyPill.bottom
|
||||
anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 2 * UM.Theme.getSize("default_margin").width
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 2 * UM.Theme.getSize("default_margin").width
|
||||
height: childrenRect.height
|
||||
spacing: UM.Theme.getSize("default_margin").width
|
||||
|
||||
PrintCoreConfiguration
|
||||
{
|
||||
id: leftExtruderInfo
|
||||
width: Math.round(parent.width / 2)
|
||||
printCoreConfiguration: modelData.printerConfiguration.extruderConfigurations[0]
|
||||
}
|
||||
|
||||
PrintCoreConfiguration
|
||||
{
|
||||
id: rightExtruderInfo
|
||||
width: Math.round(parent.width / 2)
|
||||
printCoreConfiguration: modelData.printerConfiguration.extruderConfigurations[1]
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle
|
||||
{
|
||||
id: jobSpacer
|
||||
color: UM.Theme.getColor("viewport_background")
|
||||
height: 2
|
||||
anchors
|
||||
{
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
margins: UM.Theme.getSize("default_margin").width
|
||||
top: extrudersInfo.bottom
|
||||
topMargin: 2 * UM.Theme.getSize("default_margin").height
|
||||
}
|
||||
}
|
||||
|
||||
Item
|
||||
{
|
||||
id: jobInfo
|
||||
property var showJobInfo: modelData.activePrintJob != null && modelData.activePrintJob.state != "queued"
|
||||
|
||||
anchors.top: jobSpacer.bottom
|
||||
anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.margins: UM.Theme.getSize("default_margin").width
|
||||
anchors.leftMargin: 2 * UM.Theme.getSize("default_margin").width
|
||||
height: showJobInfo ? childrenRect.height + 2 * UM.Theme.getSize("default_margin").height: 0
|
||||
visible: showJobInfo
|
||||
Label
|
||||
{
|
||||
id: printJobName
|
||||
text: modelData.activePrintJob != null ? modelData.activePrintJob.name : ""
|
||||
font: UM.Theme.getFont("default_bold")
|
||||
anchors.left: parent.left
|
||||
anchors.right: contextButton.left
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
Label
|
||||
{
|
||||
id: ownerName
|
||||
anchors.top: printJobName.bottom
|
||||
text: modelData.activePrintJob != null ? modelData.activePrintJob.owner : ""
|
||||
font: UM.Theme.getFont("default")
|
||||
opacity: 0.6
|
||||
width: parent.width
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
|
||||
function switchPopupState()
|
||||
{
|
||||
popup.visible ? popup.close() : popup.open()
|
||||
}
|
||||
|
||||
Controls2.Button
|
||||
{
|
||||
id: contextButton
|
||||
text: "\u22EE" //Unicode; Three stacked points.
|
||||
width: 35
|
||||
height: width
|
||||
anchors
|
||||
{
|
||||
right: parent.right
|
||||
top: parent.top
|
||||
}
|
||||
hoverEnabled: true
|
||||
|
||||
background: Rectangle
|
||||
{
|
||||
opacity: contextButton.down || contextButton.hovered ? 1 : 0
|
||||
width: contextButton.width
|
||||
height: contextButton.height
|
||||
radius: 0.5 * width
|
||||
color: UM.Theme.getColor("viewport_background")
|
||||
}
|
||||
contentItem: Label
|
||||
{
|
||||
text: contextButton.text
|
||||
color: UM.Theme.getColor("monitor_tab_text_inactive")
|
||||
font.pixelSize: 25
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
}
|
||||
|
||||
onClicked: parent.switchPopupState()
|
||||
}
|
||||
|
||||
Controls2.Popup
|
||||
{
|
||||
// TODO Change once updating to Qt5.10 - The 'opened' property is in 5.10 but the behavior is now implemented with the visible property
|
||||
id: popup
|
||||
clip: true
|
||||
closePolicy: Popup.CloseOnPressOutside
|
||||
x: (parent.width - width) + 26 * screenScaleFactor
|
||||
y: contextButton.height - 5 * screenScaleFactor // Because shadow
|
||||
width: 182 * screenScaleFactor
|
||||
height: contentItem.height + 2 * padding
|
||||
visible: false
|
||||
padding: 5 * screenScaleFactor // Because shadow
|
||||
|
||||
transformOrigin: Popup.Top
|
||||
contentItem: Item
|
||||
{
|
||||
width: popup.width
|
||||
height: childrenRect.height + 36 * screenScaleFactor
|
||||
anchors.topMargin: 10 * screenScaleFactor
|
||||
anchors.bottomMargin: 10 * screenScaleFactor
|
||||
Controls2.Button
|
||||
{
|
||||
id: pauseButton
|
||||
text: modelData.activePrintJob != null && modelData.activePrintJob.state == "paused" ? catalog.i18nc("@label", "Resume") : catalog.i18nc("@label", "Pause")
|
||||
onClicked:
|
||||
{
|
||||
if(modelData.activePrintJob.state == "paused")
|
||||
{
|
||||
modelData.activePrintJob.setState("print")
|
||||
}
|
||||
else if(modelData.activePrintJob.state == "printing")
|
||||
{
|
||||
modelData.activePrintJob.setState("pause")
|
||||
}
|
||||
popup.close()
|
||||
}
|
||||
width: parent.width
|
||||
enabled: modelData.activePrintJob != null && ["paused", "printing"].indexOf(modelData.activePrintJob.state) >= 0
|
||||
visible: enabled
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 18 * screenScaleFactor
|
||||
height: visible ? 39 * screenScaleFactor : 0 * screenScaleFactor
|
||||
hoverEnabled: true
|
||||
background: Rectangle
|
||||
{
|
||||
opacity: pauseButton.down || pauseButton.hovered ? 1 : 0
|
||||
color: UM.Theme.getColor("viewport_background")
|
||||
}
|
||||
contentItem: Label
|
||||
{
|
||||
text: pauseButton.text
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
}
|
||||
|
||||
Controls2.Button
|
||||
{
|
||||
id: abortButton
|
||||
text: catalog.i18nc("@label", "Abort")
|
||||
onClicked:
|
||||
{
|
||||
abortConfirmationDialog.visible = true;
|
||||
popup.close();
|
||||
}
|
||||
width: parent.width
|
||||
height: 39 * screenScaleFactor
|
||||
anchors.top: pauseButton.bottom
|
||||
hoverEnabled: true
|
||||
enabled: modelData.activePrintJob != null && ["paused", "printing", "pre_print"].indexOf(modelData.activePrintJob.state) >= 0
|
||||
background: Rectangle
|
||||
{
|
||||
opacity: abortButton.down || abortButton.hovered ? 1 : 0
|
||||
color: UM.Theme.getColor("viewport_background")
|
||||
}
|
||||
contentItem: Label
|
||||
{
|
||||
text: abortButton.text
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
}
|
||||
|
||||
MessageDialog
|
||||
{
|
||||
id: abortConfirmationDialog
|
||||
title: catalog.i18nc("@window:title", "Abort print")
|
||||
icon: StandardIcon.Warning
|
||||
text: catalog.i18nc("@label %1 is the name of a print job.", "Are you sure you want to abort %1?").arg(modelData.activePrintJob.name)
|
||||
standardButtons: StandardButton.Yes | StandardButton.No
|
||||
Component.onCompleted: visible = false
|
||||
onYes: modelData.activePrintJob.setState("abort")
|
||||
}
|
||||
}
|
||||
|
||||
background: Item
|
||||
{
|
||||
width: popup.width
|
||||
height: popup.height
|
||||
|
||||
DropShadow
|
||||
{
|
||||
anchors.fill: pointedRectangle
|
||||
radius: 5
|
||||
color: "#3F000000" // 25% shadow
|
||||
source: pointedRectangle
|
||||
transparentBorder: true
|
||||
verticalOffset: 2
|
||||
}
|
||||
|
||||
Item
|
||||
{
|
||||
id: pointedRectangle
|
||||
width: parent.width - 10 * screenScaleFactor // Because of the shadow
|
||||
height: parent.height - 10 * screenScaleFactor // Because of the shadow
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
Rectangle
|
||||
{
|
||||
id: point
|
||||
height: 14 * screenScaleFactor
|
||||
width: 14 * screenScaleFactor
|
||||
color: UM.Theme.getColor("setting_control")
|
||||
transform: Rotation { angle: 45}
|
||||
anchors.right: bloop.right
|
||||
anchors.rightMargin: 24
|
||||
y: 1
|
||||
}
|
||||
|
||||
Rectangle
|
||||
{
|
||||
id: bloop
|
||||
color: UM.Theme.getColor("setting_control")
|
||||
width: parent.width
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 8 * screenScaleFactor // Because of the shadow + point
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.bottomMargin: 8 * screenScaleFactor // Because of the shadow
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
exit: Transition
|
||||
{
|
||||
// This applies a default NumberAnimation to any changes a state change makes to x or y properties
|
||||
NumberAnimation { property: "visible"; duration: 75; }
|
||||
}
|
||||
enter: Transition
|
||||
{
|
||||
// This applies a default NumberAnimation to any changes a state change makes to x or y properties
|
||||
NumberAnimation { property: "visible"; duration: 75; }
|
||||
}
|
||||
|
||||
onClosed: visible = false
|
||||
onOpened: visible = true
|
||||
}
|
||||
|
||||
Image
|
||||
{
|
||||
id: printJobPreview
|
||||
source: modelData.activePrintJob != null ? modelData.activePrintJob.previewImageUrl : ""
|
||||
anchors.top: ownerName.bottom
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
width: parent.width / 2
|
||||
height: width
|
||||
opacity:
|
||||
{
|
||||
if(modelData.activePrintJob == null)
|
||||
{
|
||||
return 1.0
|
||||
}
|
||||
|
||||
switch(modelData.activePrintJob.state)
|
||||
{
|
||||
case "wait_cleanup":
|
||||
case "wait_user_action":
|
||||
case "paused":
|
||||
return 0.5
|
||||
default:
|
||||
return 1.0
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
UM.RecolorImage
|
||||
{
|
||||
id: statusImage
|
||||
anchors.centerIn: printJobPreview
|
||||
source:
|
||||
{
|
||||
if(modelData.activePrintJob == null)
|
||||
{
|
||||
return ""
|
||||
}
|
||||
switch(modelData.activePrintJob.state)
|
||||
{
|
||||
case "paused":
|
||||
return "../svg/paused-icon.svg"
|
||||
case "wait_cleanup":
|
||||
if(modelData.activePrintJob.timeElapsed < modelData.activePrintJob.timeTotal)
|
||||
{
|
||||
return "../svg/aborted-icon.svg"
|
||||
}
|
||||
return "../svg/approved-icon.svg"
|
||||
case "wait_user_action":
|
||||
return "../svg/aborted-icon.svg"
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
visible: source != ""
|
||||
width: 0.5 * printJobPreview.width
|
||||
height: 0.5 * printJobPreview.height
|
||||
sourceSize.width: width
|
||||
sourceSize.height: height
|
||||
color: "black"
|
||||
}
|
||||
|
||||
CameraButton
|
||||
{
|
||||
id: showCameraButton
|
||||
iconSource: "../svg/camera-icon.svg"
|
||||
anchors
|
||||
{
|
||||
left: parent.left
|
||||
bottom: printJobPreview.bottom
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ProgressBar
|
||||
{
|
||||
property var progress:
|
||||
{
|
||||
if(modelData.activePrintJob == null)
|
||||
{
|
||||
return 0
|
||||
}
|
||||
var result = modelData.activePrintJob.timeElapsed / modelData.activePrintJob.timeTotal
|
||||
if(result > 1.0)
|
||||
{
|
||||
result = 1.0
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
id: jobProgressBar
|
||||
width: parent.width
|
||||
value: progress
|
||||
anchors.top: detailedInfo.bottom
|
||||
anchors.topMargin: UM.Theme.getSize("default_margin").height
|
||||
|
||||
visible: modelData.activePrintJob != null && modelData.activePrintJob != undefined
|
||||
|
||||
style: ProgressBarStyle
|
||||
{
|
||||
property var remainingTime:
|
||||
{
|
||||
if(modelData.activePrintJob == null)
|
||||
{
|
||||
return 0
|
||||
}
|
||||
/* 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
|
||||
as displaying "-1h -1m". */
|
||||
var activeJob = modelData.activePrintJob
|
||||
return Math.max(activeJob.timeTotal - activeJob.timeElapsed, 0);
|
||||
}
|
||||
property var progressText:
|
||||
{
|
||||
if(modelData.activePrintJob == null)
|
||||
{
|
||||
return ""
|
||||
}
|
||||
switch(modelData.activePrintJob.state)
|
||||
{
|
||||
case "wait_cleanup":
|
||||
if(modelData.activePrintJob.timeTotal > modelData.activePrintJob.timeElapsed)
|
||||
{
|
||||
return catalog.i18nc("@label:status", "Aborted")
|
||||
}
|
||||
return catalog.i18nc("@label:status", "Finished")
|
||||
case "pre_print":
|
||||
case "sent_to_printer":
|
||||
return catalog.i18nc("@label:status", "Preparing")
|
||||
case "aborted":
|
||||
return catalog.i18nc("@label:status", "Aborted")
|
||||
case "wait_user_action":
|
||||
return catalog.i18nc("@label:status", "Aborted")
|
||||
case "pausing":
|
||||
return catalog.i18nc("@label:status", "Pausing")
|
||||
case "paused":
|
||||
return OutputDevice.formatDuration( remainingTime )
|
||||
case "resuming":
|
||||
return catalog.i18nc("@label:status", "Resuming")
|
||||
case "queued":
|
||||
return catalog.i18nc("@label:status", "Action required")
|
||||
default:
|
||||
return OutputDevice.formatDuration( remainingTime )
|
||||
}
|
||||
}
|
||||
|
||||
background: Rectangle
|
||||
{
|
||||
implicitWidth: 100
|
||||
implicitHeight: visible ? 24 : 0
|
||||
color: UM.Theme.getColor("viewport_background")
|
||||
}
|
||||
|
||||
progress: Rectangle
|
||||
{
|
||||
color:
|
||||
{
|
||||
var state = modelData.activePrintJob.state
|
||||
var inactiveStates = [
|
||||
"pausing",
|
||||
"paused",
|
||||
"resuming",
|
||||
"wait_cleanup"
|
||||
]
|
||||
if(inactiveStates.indexOf(state) > -1 && remainingTime > 0)
|
||||
{
|
||||
return UM.Theme.getColor("monitor_tab_text_inactive")
|
||||
}
|
||||
else
|
||||
{
|
||||
return UM.Theme.getColor("primary")
|
||||
}
|
||||
}
|
||||
id: progressItem
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
Label
|
||||
{
|
||||
id: progressLabel
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: getTextOffset()
|
||||
text: progressText
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
color: progressItem.width + progressLabel.width < control.width ? "black" : "white"
|
||||
width: contentWidth
|
||||
font: UM.Theme.getFont("default")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
printer: modelData
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -40,7 +40,7 @@ Item {
|
||||
layer.effect: DropShadow {
|
||||
radius: root.shadowRadius
|
||||
verticalOffset: 2 * screenScaleFactor
|
||||
color: "#3F000000" // 25% shadow
|
||||
color: "#3F000000" // 25% shadow
|
||||
}
|
||||
|
||||
Column {
|
||||
|
||||
652
plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml
Normal file
652
plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml
Normal file
@ -0,0 +1,652 @@
|
||||
import QtQuick 2.3
|
||||
import QtQuick.Dialogs 1.1
|
||||
import QtQuick.Controls 2.0
|
||||
import QtQuick.Controls.Styles 1.3
|
||||
import QtGraphicalEffects 1.0
|
||||
import QtQuick.Controls 1.4 as LegacyControls
|
||||
import UM 1.3 as UM
|
||||
|
||||
Item {
|
||||
id: root;
|
||||
|
||||
property var shadowRadius: 5;
|
||||
property var shadowOffset: 2;
|
||||
property var printer: null;
|
||||
property var collapsed: true;
|
||||
|
||||
height: childrenRect.height + shadowRadius * 2; // Bubbles upward
|
||||
width: parent.width; // Bubbles downward
|
||||
|
||||
// The actual card (white block)
|
||||
Rectangle {
|
||||
// 5px margin, but shifted 2px vertically because of the shadow
|
||||
anchors {
|
||||
topMargin: root.shadowRadius - root.shadowOffset;
|
||||
bottomMargin: root.shadowRadius + root.shadowOffset;
|
||||
leftMargin: root.shadowRadius;
|
||||
rightMargin: root.shadowRadius;
|
||||
}
|
||||
color: {
|
||||
if (printer.state == "disabled") {
|
||||
return UM.Theme.getColor("monitor_tab_background_inactive");
|
||||
} else {
|
||||
return UM.Theme.getColor("monitor_tab_background_active");
|
||||
}
|
||||
}
|
||||
height: childrenRect.height;
|
||||
layer.effect: DropShadow {
|
||||
radius: root.shadowRadius;
|
||||
verticalOffset: root.shadowOffset;
|
||||
color: "#3F000000"; // 25% shadow
|
||||
}
|
||||
layer.enabled: true
|
||||
width: parent.width - 2 * shadowRadius;
|
||||
|
||||
// Main card
|
||||
Rectangle {
|
||||
id: mainCard;
|
||||
anchors.top: parent.top;
|
||||
color: "pink";
|
||||
height: childrenRect.height;
|
||||
width: parent.width;
|
||||
|
||||
// Machine icon
|
||||
Item {
|
||||
id: machineIcon;
|
||||
anchors {
|
||||
left: parent.left;
|
||||
leftMargin: UM.Theme.getSize("wide_margin").width;
|
||||
margins: UM.Theme.getSize("default_margin").width;
|
||||
top: parent.top;
|
||||
}
|
||||
height: 58;
|
||||
width: 58;
|
||||
|
||||
// Skeleton
|
||||
Rectangle {
|
||||
anchors {
|
||||
fill: parent;
|
||||
// margins: Math.round(UM.Theme.getSize("default_margin").width / 4);
|
||||
}
|
||||
color: UM.Theme.getColor("viewport_background"); // TODO: Theme!
|
||||
radius: UM.Theme.getSize("default_margin").width; // TODO: Theme!
|
||||
visible: !printer;
|
||||
}
|
||||
|
||||
// Content
|
||||
UM.RecolorImage {
|
||||
anchors.centerIn: parent;
|
||||
color: {
|
||||
if (printer.state == "disabled") {
|
||||
return UM.Theme.getColor("monitor_tab_text_inactive");
|
||||
}
|
||||
if (printer.activePrintJob != undefined) {
|
||||
return UM.Theme.getColor("primary");
|
||||
}
|
||||
return UM.Theme.getColor("monitor_tab_text_inactive");
|
||||
}
|
||||
height: sourceSize.height;
|
||||
source: {
|
||||
switch(printer.type) {
|
||||
case "Ultimaker 3":
|
||||
return "../svg/UM3-icon.svg";
|
||||
case "Ultimaker 3 Extended":
|
||||
return "../svg/UM3x-icon.svg";
|
||||
case "Ultimaker S5":
|
||||
return "../svg/UMs5-icon.svg";
|
||||
}
|
||||
}
|
||||
visible: printer;
|
||||
width: sourceSize.width;
|
||||
}
|
||||
}
|
||||
|
||||
// Printer info
|
||||
Item {
|
||||
id: printerInfo;
|
||||
height: childrenRect.height
|
||||
anchors {
|
||||
left: machineIcon.right;
|
||||
leftMargin: UM.Theme.getSize("default_margin").width;
|
||||
right: collapseIcon.left;
|
||||
rightMargin: UM.Theme.getSize("default_margin").width;
|
||||
verticalCenter: machineIcon.verticalCenter;
|
||||
}
|
||||
|
||||
// Machine name
|
||||
Item {
|
||||
id: machineNameLabel;
|
||||
height: UM.Theme.getSize("monitor_tab_text_line").height;
|
||||
width: parent.width * 0.3;
|
||||
|
||||
// Skeleton
|
||||
Rectangle {
|
||||
anchors.fill: parent;
|
||||
color: UM.Theme.getColor("viewport_background"); // TODO: Theme!
|
||||
visible: !printer;
|
||||
}
|
||||
|
||||
// Actual content
|
||||
Label {
|
||||
anchors.fill: parent;
|
||||
elide: Text.ElideRight;
|
||||
font: UM.Theme.getFont("default_bold");
|
||||
text: printer.name;
|
||||
visible: printer;
|
||||
width: parent.width;
|
||||
}
|
||||
}
|
||||
|
||||
// Job name
|
||||
Item {
|
||||
id: activeJobLabel;
|
||||
anchors {
|
||||
top: machineNameLabel.bottom;
|
||||
topMargin: Math.round(UM.Theme.getSize("default_margin").height / 2);
|
||||
}
|
||||
height: UM.Theme.getSize("monitor_tab_text_line").height;
|
||||
width: parent.width * 0.75;
|
||||
|
||||
|
||||
// Skeleton
|
||||
Rectangle {
|
||||
anchors.fill: parent;
|
||||
color: UM.Theme.getColor("viewport_background"); // TODO: Theme!
|
||||
visible: !printer;
|
||||
}
|
||||
|
||||
// Actual content
|
||||
Label {
|
||||
anchors.fill: parent;
|
||||
color: UM.Theme.getColor("monitor_tab_text_inactive");
|
||||
elide: Text.ElideRight;
|
||||
font: UM.Theme.getFont("default");
|
||||
text: {
|
||||
if (printer.state == "disabled") {
|
||||
return catalog.i18nc("@label", "Not available");
|
||||
} else if (printer.state == "unreachable") {
|
||||
return catalog.i18nc("@label", "Unreachable");
|
||||
}
|
||||
if (printer.activePrintJob != null) {
|
||||
return printer.activePrintJob.name;
|
||||
}
|
||||
return catalog.i18nc("@label", "Available");
|
||||
}
|
||||
visible: printer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Collapse icon
|
||||
UM.RecolorImage {
|
||||
id: collapseIcon;
|
||||
anchors {
|
||||
right: parent.right;
|
||||
rightMargin: UM.Theme.getSize("default_margin").width;
|
||||
verticalCenter: parent.verticalCenter;
|
||||
}
|
||||
color: UM.Theme.getColor("text");
|
||||
height: 15; // TODO: Theme!
|
||||
source: root.collapsed ? UM.Theme.getIcon("arrow_left") : UM.Theme.getIcon("arrow_bottom");
|
||||
sourceSize.height: height;
|
||||
sourceSize.width: width;
|
||||
visible: printer;
|
||||
width: 15; // TODO: Theme!
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent;
|
||||
enabled: printer;
|
||||
onClicked: {
|
||||
console.log(printerInfo.height)
|
||||
if (root.collapsed && model) {
|
||||
printerList.currentIndex = model.index;
|
||||
} else {
|
||||
printerList.currentIndex = -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: printerList
|
||||
onCurrentIndexChanged: {
|
||||
root.collapsed = printerList.currentIndex != model.index;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Detailed card
|
||||
Rectangle {
|
||||
width: parent.width;
|
||||
height: 0;
|
||||
anchors.top: mainCard.bottom;
|
||||
anchors.bottom: progressBar.top;
|
||||
}
|
||||
|
||||
// Progress bar
|
||||
PrinterCardProgressBar {
|
||||
id: progressBar;
|
||||
anchors {
|
||||
bottom: parent.bottom;
|
||||
}
|
||||
visible: printer && printer.activePrintJob != null && printer.activePrintJob != undefined;
|
||||
width: parent.width;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// Item
|
||||
// {
|
||||
// id: detailedInfo
|
||||
// property var printJob: printer.activePrintJob
|
||||
// visible: height == childrenRect.height
|
||||
// anchors.top: printerInfo.bottom
|
||||
// width: parent.width
|
||||
// height: !root.collapsed ? childrenRect.height : 0
|
||||
// opacity: visible ? 1 : 0
|
||||
// Behavior on height { NumberAnimation { duration: 100 } }
|
||||
// Behavior on opacity { NumberAnimation { duration: 100 } }
|
||||
// Rectangle
|
||||
// {
|
||||
// id: topSpacer
|
||||
// color:
|
||||
// {
|
||||
// if(printer.state == "disabled")
|
||||
// {
|
||||
// return UM.Theme.getColor("monitor_lining_inactive")
|
||||
// }
|
||||
// return UM.Theme.getColor("viewport_background")
|
||||
// }
|
||||
// // UM.Theme.getColor("viewport_background")
|
||||
// height: 1
|
||||
// anchors
|
||||
// {
|
||||
// left: parent.left
|
||||
// right: parent.right
|
||||
// margins: UM.Theme.getSize("default_margin").width
|
||||
// top: parent.top
|
||||
// topMargin: UM.Theme.getSize("default_margin").width
|
||||
// }
|
||||
// }
|
||||
// PrinterFamilyPill
|
||||
// {
|
||||
// id: printerFamilyPill
|
||||
// color:
|
||||
// {
|
||||
// if(printer.state == "disabled")
|
||||
// {
|
||||
// return "transparent"
|
||||
// }
|
||||
// return UM.Theme.getColor("viewport_background")
|
||||
// }
|
||||
// anchors.top: topSpacer.bottom
|
||||
// anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height
|
||||
// text: printer.type
|
||||
// anchors.left: parent.left
|
||||
// anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
// padding: 3
|
||||
// }
|
||||
// Row
|
||||
// {
|
||||
// id: extrudersInfo
|
||||
// anchors.top: printerFamilyPill.bottom
|
||||
// anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height
|
||||
// anchors.left: parent.left
|
||||
// anchors.leftMargin: 2 * UM.Theme.getSize("default_margin").width
|
||||
// anchors.right: parent.right
|
||||
// anchors.rightMargin: 2 * UM.Theme.getSize("default_margin").width
|
||||
// height: childrenRect.height
|
||||
// spacing: UM.Theme.getSize("default_margin").width
|
||||
|
||||
// PrintCoreConfiguration
|
||||
// {
|
||||
// id: leftExtruderInfo
|
||||
// width: Math.round(parent.width / 2)
|
||||
// printCoreConfiguration: printer.printerConfiguration.extruderConfigurations[0]
|
||||
// }
|
||||
|
||||
// PrintCoreConfiguration
|
||||
// {
|
||||
// id: rightExtruderInfo
|
||||
// width: Math.round(parent.width / 2)
|
||||
// printCoreConfiguration: printer.printerConfiguration.extruderConfigurations[1]
|
||||
// }
|
||||
// }
|
||||
|
||||
// Rectangle
|
||||
// {
|
||||
// id: jobSpacer
|
||||
// color: UM.Theme.getColor("viewport_background")
|
||||
// height: 2
|
||||
// anchors
|
||||
// {
|
||||
// left: parent.left
|
||||
// right: parent.right
|
||||
// margins: UM.Theme.getSize("default_margin").width
|
||||
// top: extrudersInfo.bottom
|
||||
// topMargin: 2 * UM.Theme.getSize("default_margin").height
|
||||
// }
|
||||
// }
|
||||
|
||||
// Item
|
||||
// {
|
||||
// id: jobInfo
|
||||
// property var showJobInfo: printer.activePrintJob != null && printer.activePrintJob.state != "queued"
|
||||
|
||||
// anchors.top: jobSpacer.bottom
|
||||
// anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height
|
||||
// anchors.left: parent.left
|
||||
// anchors.right: parent.right
|
||||
// anchors.margins: UM.Theme.getSize("default_margin").width
|
||||
// anchors.leftMargin: 2 * UM.Theme.getSize("default_margin").width
|
||||
// height: showJobInfo ? childrenRect.height + 2 * UM.Theme.getSize("default_margin").height: 0
|
||||
// visible: showJobInfo
|
||||
// Label
|
||||
// {
|
||||
// id: printJobName
|
||||
// text: printer.activePrintJob != null ? printer.activePrintJob.name : ""
|
||||
// font: UM.Theme.getFont("default_bold")
|
||||
// anchors.left: parent.left
|
||||
// anchors.right: contextButton.left
|
||||
// anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
// elide: Text.ElideRight
|
||||
// }
|
||||
// Label
|
||||
// {
|
||||
// id: ownerName
|
||||
// anchors.top: printJobName.bottom
|
||||
// text: printer.activePrintJob != null ? printer.activePrintJob.owner : ""
|
||||
// font: UM.Theme.getFont("default")
|
||||
// opacity: 0.6
|
||||
// width: parent.width
|
||||
// elide: Text.ElideRight
|
||||
// }
|
||||
|
||||
// function switchPopupState()
|
||||
// {
|
||||
// popup.visible ? popup.close() : popup.open()
|
||||
// }
|
||||
|
||||
// Button
|
||||
// {
|
||||
// id: contextButton
|
||||
// text: "\u22EE" //Unicode; Three stacked points.
|
||||
// width: 35
|
||||
// height: width
|
||||
// anchors
|
||||
// {
|
||||
// right: parent.right
|
||||
// top: parent.top
|
||||
// }
|
||||
// hoverEnabled: true
|
||||
|
||||
// background: Rectangle
|
||||
// {
|
||||
// opacity: contextButton.down || contextButton.hovered ? 1 : 0
|
||||
// width: contextButton.width
|
||||
// height: contextButton.height
|
||||
// radius: 0.5 * width
|
||||
// color: UM.Theme.getColor("viewport_background")
|
||||
// }
|
||||
// contentItem: Label
|
||||
// {
|
||||
// text: contextButton.text
|
||||
// color: UM.Theme.getColor("monitor_tab_text_inactive")
|
||||
// font.pixelSize: 25
|
||||
// verticalAlignment: Text.AlignVCenter
|
||||
// horizontalAlignment: Text.AlignHCenter
|
||||
// }
|
||||
|
||||
// onClicked: parent.switchPopupState()
|
||||
// }
|
||||
|
||||
// Popup
|
||||
// {
|
||||
// // TODO Change once updating to Qt5.10 - The 'opened' property is in 5.10 but the behavior is now implemented with the visible property
|
||||
// id: popup
|
||||
// clip: true
|
||||
// closePolicy: Popup.CloseOnPressOutside
|
||||
// x: (parent.width - width) + 26 * screenScaleFactor
|
||||
// y: contextButton.height - 5 * screenScaleFactor // Because shadow
|
||||
// width: 182 * screenScaleFactor
|
||||
// height: contentItem.height + 2 * padding
|
||||
// visible: false
|
||||
// padding: 5 * screenScaleFactor // Because shadow
|
||||
|
||||
// transformOrigin: Popup.Top
|
||||
// contentItem: Item
|
||||
// {
|
||||
// width: popup.width
|
||||
// height: childrenRect.height + 36 * screenScaleFactor
|
||||
// anchors.topMargin: 10 * screenScaleFactor
|
||||
// anchors.bottomMargin: 10 * screenScaleFactor
|
||||
// Button
|
||||
// {
|
||||
// id: pauseButton
|
||||
// text: printer.activePrintJob != null && printer.activePrintJob.state == "paused" ? catalog.i18nc("@label", "Resume") : catalog.i18nc("@label", "Pause")
|
||||
// onClicked:
|
||||
// {
|
||||
// if(printer.activePrintJob.state == "paused")
|
||||
// {
|
||||
// printer.activePrintJob.setState("print")
|
||||
// }
|
||||
// else if(printer.activePrintJob.state == "printing")
|
||||
// {
|
||||
// printer.activePrintJob.setState("pause")
|
||||
// }
|
||||
// popup.close()
|
||||
// }
|
||||
// width: parent.width
|
||||
// enabled: printer.activePrintJob != null && ["paused", "printing"].indexOf(printer.activePrintJob.state) >= 0
|
||||
// visible: enabled
|
||||
// anchors.top: parent.top
|
||||
// anchors.topMargin: 18 * screenScaleFactor
|
||||
// height: visible ? 39 * screenScaleFactor : 0 * screenScaleFactor
|
||||
// hoverEnabled: true
|
||||
// background: Rectangle
|
||||
// {
|
||||
// opacity: pauseButton.down || pauseButton.hovered ? 1 : 0
|
||||
// color: UM.Theme.getColor("viewport_background")
|
||||
// }
|
||||
// contentItem: Label
|
||||
// {
|
||||
// text: pauseButton.text
|
||||
// horizontalAlignment: Text.AlignLeft
|
||||
// verticalAlignment: Text.AlignVCenter
|
||||
// }
|
||||
// }
|
||||
|
||||
// Button
|
||||
// {
|
||||
// id: abortButton
|
||||
// text: catalog.i18nc("@label", "Abort")
|
||||
// onClicked:
|
||||
// {
|
||||
// abortConfirmationDialog.visible = true;
|
||||
// popup.close();
|
||||
// }
|
||||
// width: parent.width
|
||||
// height: 39 * screenScaleFactor
|
||||
// anchors.top: pauseButton.bottom
|
||||
// hoverEnabled: true
|
||||
// enabled: printer.activePrintJob != null && ["paused", "printing", "pre_print"].indexOf(printer.activePrintJob.state) >= 0
|
||||
// background: Rectangle
|
||||
// {
|
||||
// opacity: abortButton.down || abortButton.hovered ? 1 : 0
|
||||
// color: UM.Theme.getColor("viewport_background")
|
||||
// }
|
||||
// contentItem: Label
|
||||
// {
|
||||
// text: abortButton.text
|
||||
// horizontalAlignment: Text.AlignLeft
|
||||
// verticalAlignment: Text.AlignVCenter
|
||||
// }
|
||||
// }
|
||||
|
||||
// MessageDialog
|
||||
// {
|
||||
// id: abortConfirmationDialog
|
||||
// title: catalog.i18nc("@window:title", "Abort print")
|
||||
// icon: StandardIcon.Warning
|
||||
// text: catalog.i18nc("@label %1 is the name of a print job.", "Are you sure you want to abort %1?").arg(printer.activePrintJob.name)
|
||||
// standardButtons: StandardButton.Yes | StandardButton.No
|
||||
// Component.onCompleted: visible = false
|
||||
// onYes: printer.activePrintJob.setState("abort")
|
||||
// }
|
||||
// }
|
||||
|
||||
// background: Item
|
||||
// {
|
||||
// width: popup.width
|
||||
// height: popup.height
|
||||
|
||||
// DropShadow
|
||||
// {
|
||||
// anchors.fill: pointedRectangle
|
||||
// radius: 5
|
||||
// color: "#3F000000" // 25% shadow
|
||||
// source: pointedRectangle
|
||||
// transparentBorder: true
|
||||
// verticalOffset: 2
|
||||
// }
|
||||
|
||||
// Item
|
||||
// {
|
||||
// id: pointedRectangle
|
||||
// width: parent.width - 10 * screenScaleFactor // Because of the shadow
|
||||
// height: parent.height - 10 * screenScaleFactor // Because of the shadow
|
||||
// anchors.horizontalCenter: parent.horizontalCenter
|
||||
// anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
// Rectangle
|
||||
// {
|
||||
// id: point
|
||||
// height: 14 * screenScaleFactor
|
||||
// width: 14 * screenScaleFactor
|
||||
// color: UM.Theme.getColor("setting_control")
|
||||
// transform: Rotation { angle: 45}
|
||||
// anchors.right: bloop.right
|
||||
// anchors.rightMargin: 24
|
||||
// y: 1
|
||||
// }
|
||||
|
||||
// Rectangle
|
||||
// {
|
||||
// id: bloop
|
||||
// color: UM.Theme.getColor("setting_control")
|
||||
// width: parent.width
|
||||
// anchors.top: parent.top
|
||||
// anchors.topMargin: 8 * screenScaleFactor // Because of the shadow + point
|
||||
// anchors.bottom: parent.bottom
|
||||
// anchors.bottomMargin: 8 * screenScaleFactor // Because of the shadow
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// exit: Transition
|
||||
// {
|
||||
// // This applies a default NumberAnimation to any changes a state change makes to x or y properties
|
||||
// NumberAnimation { property: "visible"; duration: 75; }
|
||||
// }
|
||||
// enter: Transition
|
||||
// {
|
||||
// // This applies a default NumberAnimation to any changes a state change makes to x or y properties
|
||||
// NumberAnimation { property: "visible"; duration: 75; }
|
||||
// }
|
||||
|
||||
// onClosed: visible = false
|
||||
// onOpened: visible = true
|
||||
// }
|
||||
|
||||
// Image
|
||||
// {
|
||||
// id: printJobPreview
|
||||
// source: printer.activePrintJob != null ? printer.activePrintJob.previewImageUrl : ""
|
||||
// anchors.top: ownerName.bottom
|
||||
// anchors.horizontalCenter: parent.horizontalCenter
|
||||
// width: parent.width / 2
|
||||
// height: width
|
||||
// opacity:
|
||||
// {
|
||||
// if(printer.activePrintJob == null)
|
||||
// {
|
||||
// return 1.0
|
||||
// }
|
||||
|
||||
// switch(printer.activePrintJob.state)
|
||||
// {
|
||||
// case "wait_cleanup":
|
||||
// case "wait_user_action":
|
||||
// case "paused":
|
||||
// return 0.5
|
||||
// default:
|
||||
// return 1.0
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
// }
|
||||
|
||||
// UM.RecolorImage
|
||||
// {
|
||||
// id: statusImage
|
||||
// anchors.centerIn: printJobPreview
|
||||
// source:
|
||||
// {
|
||||
// if(printer.activePrintJob == null)
|
||||
// {
|
||||
// return ""
|
||||
// }
|
||||
// switch(printer.activePrintJob.state)
|
||||
// {
|
||||
// case "paused":
|
||||
// return "../svg/paused-icon.svg"
|
||||
// case "wait_cleanup":
|
||||
// if(printer.activePrintJob.timeElapsed < printer.activePrintJob.timeTotal)
|
||||
// {
|
||||
// return "../svg/aborted-icon.svg"
|
||||
// }
|
||||
// return "../svg/approved-icon.svg"
|
||||
// case "wait_user_action":
|
||||
// return "../svg/aborted-icon.svg"
|
||||
// default:
|
||||
// return ""
|
||||
// }
|
||||
// }
|
||||
// visible: source != ""
|
||||
// width: 0.5 * printJobPreview.width
|
||||
// height: 0.5 * printJobPreview.height
|
||||
// sourceSize.width: width
|
||||
// sourceSize.height: height
|
||||
// color: "black"
|
||||
// }
|
||||
|
||||
// CameraButton
|
||||
// {
|
||||
// id: showCameraButton
|
||||
// iconSource: "../svg/camera-icon.svg"
|
||||
// anchors
|
||||
// {
|
||||
// left: parent.left
|
||||
// bottom: printJobPreview.bottom
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
@ -0,0 +1,119 @@
|
||||
import QtQuick 2.3
|
||||
import QtQuick.Controls.Styles 1.3
|
||||
import QtQuick.Controls 1.4
|
||||
import UM 1.3 as UM
|
||||
|
||||
ProgressBar {
|
||||
property var progress: {
|
||||
if (printer.activePrintJob == null) {
|
||||
return 0;
|
||||
}
|
||||
var result = printer.activePrintJob.timeElapsed / printer.activePrintJob.timeTotal;
|
||||
if (result > 1.0) {
|
||||
result = 1.0;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
value: progress;
|
||||
|
||||
style: ProgressBarStyle {
|
||||
property var remainingTime:
|
||||
{
|
||||
if(printer.activePrintJob == null)
|
||||
{
|
||||
return 0
|
||||
}
|
||||
/* 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
|
||||
as displaying "-1h -1m". */
|
||||
var activeJob = printer.activePrintJob
|
||||
return Math.max(activeJob.timeTotal - activeJob.timeElapsed, 0);
|
||||
}
|
||||
property var progressText:
|
||||
{
|
||||
if(printer.activePrintJob == null)
|
||||
{
|
||||
return ""
|
||||
}
|
||||
switch(printer.activePrintJob.state)
|
||||
{
|
||||
case "wait_cleanup":
|
||||
if(printer.activePrintJob.timeTotal > printer.activePrintJob.timeElapsed)
|
||||
{
|
||||
return catalog.i18nc("@label:status", "Aborted")
|
||||
}
|
||||
return catalog.i18nc("@label:status", "Finished")
|
||||
case "pre_print":
|
||||
case "sent_to_printer":
|
||||
return catalog.i18nc("@label:status", "Preparing")
|
||||
case "aborted":
|
||||
return catalog.i18nc("@label:status", "Aborted")
|
||||
case "wait_user_action":
|
||||
return catalog.i18nc("@label:status", "Aborted")
|
||||
case "pausing":
|
||||
return catalog.i18nc("@label:status", "Pausing")
|
||||
case "paused":
|
||||
return OutputDevice.formatDuration( remainingTime )
|
||||
case "resuming":
|
||||
return catalog.i18nc("@label:status", "Resuming")
|
||||
case "queued":
|
||||
return catalog.i18nc("@label:status", "Action required")
|
||||
default:
|
||||
return OutputDevice.formatDuration( remainingTime )
|
||||
}
|
||||
}
|
||||
|
||||
background: Rectangle
|
||||
{
|
||||
implicitWidth: 100
|
||||
implicitHeight: visible ? 24 : 0
|
||||
color: UM.Theme.getColor("viewport_background")
|
||||
}
|
||||
|
||||
progress: Rectangle
|
||||
{
|
||||
color:
|
||||
{
|
||||
var state = printer.activePrintJob.state
|
||||
var inactiveStates = [
|
||||
"pausing",
|
||||
"paused",
|
||||
"resuming",
|
||||
"wait_cleanup"
|
||||
]
|
||||
if(inactiveStates.indexOf(state) > -1 && remainingTime > 0)
|
||||
{
|
||||
return UM.Theme.getColor("monitor_tab_text_inactive")
|
||||
}
|
||||
else
|
||||
{
|
||||
return UM.Theme.getColor("primary")
|
||||
}
|
||||
}
|
||||
id: progressItem
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
Label
|
||||
{
|
||||
id: progressLabel
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: getTextOffset()
|
||||
text: progressText
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
color: progressItem.width + progressLabel.width < control.width ? "black" : "white"
|
||||
width: contentWidth
|
||||
font: UM.Theme.getFont("default")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user