mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-12 07:38:58 +08:00
Change deactiveStates to inactiveStates
Contributes to CL-1047
This commit is contained in:
parent
79aeca9663
commit
90426749a2
@ -696,13 +696,13 @@ Component
|
||||
color:
|
||||
{
|
||||
var state = modelData.activePrintJob.state
|
||||
var deactiveStates = [
|
||||
var inactiveStates = [
|
||||
"pausing",
|
||||
"paused",
|
||||
"resuming",
|
||||
"wait_cleanup"
|
||||
]
|
||||
if(deactiveStates.indexOf(state) > -1 && remainingTime > 0)
|
||||
if(inactiveStates.indexOf(state) > -1 && remainingTime > 0)
|
||||
{
|
||||
return UM.Theme.getColor("monitor_secondary_text")
|
||||
}
|
||||
|
@ -10,7 +10,7 @@ Item
|
||||
{
|
||||
id: base
|
||||
property var printJob: null
|
||||
property var shadowRadius: 5
|
||||
property var shadowRadius: 5 * screenScaleFactor
|
||||
function getPrettyTime(time)
|
||||
{
|
||||
return OutputDevice.formatDuration(time)
|
||||
|
@ -471,6 +471,8 @@
|
||||
"toolbox_progress_bar": [8.0, 0.5],
|
||||
"toolbox_chart_row": [1.0, 2.0],
|
||||
"toolbox_action_button": [8.0, 2.5],
|
||||
"toolbox_loader": [2.0, 2.0]
|
||||
"toolbox_loader": [2.0, 2.0],
|
||||
|
||||
"drop_shadow_radius": [1.0, 1.0]
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user