3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-09 07:56:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Cleaned-up printe job info block

Browse source 
Contributes to CL-897, CL-1051
This commit is contained in:
Ian Paschal 2018-09-27 13:40:46 +02:00
parent 50e07ae2a7
commit 302f9a95b3
8 changed files with 811 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -111,11 +111,11 @@ Component
{
if(modelData.state == "disabled")
{
return UM.Theme.getColor("monitor_background_inactive")
return UM.Theme.getColor("monitor_tab_background_inactive")
}
else
{
return UM.Theme.getColor("monitor_background_active")
return UM.Theme.getColor("monitor_tab_background_active")
}
}
id: base
@ -196,7 +196,7 @@ Component
{
if(modelData.state == "disabled")
{
return UM.Theme.getColor("monitor_text_inactive")
return UM.Theme.getColor("monitor_tab_text_inactive")
}
if(modelData.activePrintJob != undefined)
@ -204,7 +204,7 @@ Component
return UM.Theme.getColor("primary")
}
return UM.Theme.getColor("monitor_text_inactive")
return UM.Theme.getColor("monitor_tab_text_inactive")
}
}
}
@ -252,7 +252,7 @@ Component
width: parent.width
elide: Text.ElideRight
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("monitor_text_inactive")
color: UM.Theme.getColor("monitor_tab_text_inactive")
}
}
@ -427,7 +427,7 @@ Component
contentItem: Label
{
text: contextButton.text
color: UM.Theme.getColor("monitor_text_inactive")
color: UM.Theme.getColor("monitor_tab_text_inactive")
font.pixelSize: 25
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
@ -762,7 +762,7 @@ Component
]
if(inactiveStates.indexOf(state) > -1 && remainingTime > 0)
{
return UM.Theme.getColor("monitor_text_inactive")
return UM.Theme.getColor("monitor_tab_text_inactive")
}
else
{