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

Separate black and grey text for quality menu

Browse source 
CURA-6846
This commit is contained in:
Lipu Fei 2019-10-07 21:35:28 +02:00
parent 32747d2abe
commit 8940097265
3 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View file

@ -100,18 +100,30 @@ Item
function generateActiveQualityText()
{
var result = Cura.MachineManager.activeQualityDisplayName
var resultMap = Cura.MachineManager.activeQualityDisplayNameMap
var resultMain = resultMap["main"]
var resultSuffix = resultMap["suffix"]
var result = ""
if (Cura.MachineManager.isActiveQualityExperimental)
{
result += " (Experimental)"
resultSuffix += " (Experimental)"
}
if (Cura.MachineManager.isActiveQualitySupported)
{
if (Cura.MachineManager.activeQualityLayerHeight > 0)
{
result += " <font color=\"" + UM.Theme.getColor("text_detail") + "\">"
result = resultMain
if (resultSuffix)
{
result += " - "
}
result += "<font color=\"" + UM.Theme.getColor("text_detail") + "\">"
if (resultSuffix)
{
result += resultSuffix
}
result += " - "
result += Cura.MachineManager.activeQualityLayerHeight + "mm"
result += "</font>"

7
resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
View file

@ -20,7 +20,12 @@ RowLayout
{
if (Cura.MachineManager.activeStack)
{
var text = Cura.MachineManager.activeQualityDisplayName
var resultMap = Cura.MachineManager.activeQualityDisplayNameMap
var text = resultMap["main"]
if (resultMap["suffix"])
{
text += " - " + resultMap["suffix"]
}
if (!Cura.MachineManager.hasNotSupportedQuality)
{