3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-03 20:13:56 -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

19
cura/Settings/MachineManager.py
View file

@ -1592,18 +1592,20 @@ class MachineManager(QObject):
if not no_dialog and self.hasUserSettings and self._application.getPreferences().getValue("cura/active_mode") == 1:
self._application.discardOrKeepProfileChanges()
# The display name of currently active quality.
# The display name map of currently active quality.
# The display name has 2 parts, a main part and a suffix part.
# This display name is:
# - For built-in qualities (quality/intent): the quality type name, such as "Fine", "Normal", etc.
# - For custom qualities: <custom_quality_name> - <intent_name> - <quality_type_name>
# Examples:
# - "my_profile - Fine" (only based on a default quality, no intent involved)
# - "my_profile - Engineering - Fine" (based on an intent)
@pyqtProperty(str, notify = activeQualityDisplayNameChanged)
def activeQualityDisplayName(self) -> str:
@pyqtProperty("QVariantMap", notify = activeQualityDisplayNameChanged)
def activeQualityDisplayNameMap(self) -> Dict[str, str]:
global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()
if global_stack is None:
return ""
return {"main": "",
"suffix": ""}
display_name = global_stack.quality.getName()
@ -1614,11 +1616,16 @@ class MachineManager(QObject):
display_name = "{intent_name} - {the_rest}".format(intent_name = intent_display_name,
the_rest = display_name)
main_part = display_name
suffix_part = ""
# Not a custom quality
if global_stack.qualityChanges != empty_quality_changes_container:
display_name = self.activeQualityOrQualityChangesName + " - " + display_name
main_part = self.activeQualityOrQualityChangesName
suffix_part = display_name
return display_name
return {"main": main_part,
"suffix": suffix_part}
## Change the intent category of the current printer.
#

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