3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 06:23:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '4.3' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2019-09-11 16:10:12 +02:00
commit 5e4f673ec2
No known key found for this signature in database
GPG key ID: 3710727397403C91
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ Item
property var printJob: null
width: childrenRect.width
height: 18 * screenScaleFactor // TODO: Theme!
height: UM.Theme.getSize("monitor_text_line").height
UM.ProgressBar
{
@ -31,7 +31,7 @@ Item
left: parent.left
}
value: printJob ? printJob.progress : 0
width: UM.Theme.getSize("monitor_column").width
width: UM.Theme.getSize("monitor_progress_bar").width
}
Label
@ -40,16 +40,16 @@ Item
anchors
{
left: progressBar.right
leftMargin: 18 * screenScaleFactor // TODO: Theme!
leftMargin: UM.Theme.getSize("monitor_margin").width
verticalCenter: parent.verticalCenter
}
text: printJob ? Math.round(printJob.progress * 100) + "%" : "0%"
color: printJob && printJob.isActive ? UM.Theme.getColor("monitor_text_primary") : UM.Theme.getColor("monitor_text_disabled")
width: contentWidth
font: UM.Theme.getFont("medium") // 14pt, regular
font: UM.Theme.getFont("default") // 12pt, regular
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
height: UM.Theme.getSize("monitor_text_line").height
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
@ -59,11 +59,11 @@ Item
anchors
{
left: percentLabel.right
leftMargin: 18 * screenScaleFactor // TODO: Theme!
leftMargin: UM.Theme.getSize("monitor_margin").width
verticalCenter: parent.verticalCenter
}
color: UM.Theme.getColor("monitor_text_primary")
font: UM.Theme.getFont("medium") // 14pt, regular
font: UM.Theme.getFont("default") // 12pt, regular
text:
{
if (!printJob)
@ -103,7 +103,7 @@ Item
width: contentWidth
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
height: UM.Theme.getSize("monitor_text_line").height
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}

2
resources/definitions/fdmprinter.def.json
View file

@ -2699,7 +2699,7 @@
"minimum_value": "0",
"minimum_value_warning": "line_width * 1.5",
"maximum_value_warning": "10",
"enabled": "retraction_enable",
"enabled": false,
"settable_per_mesh": false,
"settable_per_extruder": true
},

4
resources/themes/cura-light/theme.json
View file

@ -619,6 +619,8 @@
"monitor_empty_state_offset": [5.6, 5.6],
"monitor_empty_state_size": [35.0, 25.0],
"monitor_external_link_icon": [1.16, 1.16],
"monitor_column": [18.0, 1.0]
"monitor_column": [18.0, 1.0],
"monitor_progress_bar": [16.5, 1.0],
"monitor_margin": [1.5, 1.5]
}
}