3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 12:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Change deactiveStates to inactiveStates

Browse source 
Contributes to CL-1047
This commit is contained in:
Ian Paschal 2018-09-10 11:35:58 +02:00
parent 79aeca9663
commit 90426749a2
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml
View file

@ -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")
}

2
plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml
View file

@ -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)

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

@ -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]
}
}