3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent

Browse source
This commit is contained in:
Jaime van Kessel 2019-10-04 09:39:47 +02:00
commit 4793c77380
No known key found for this signature in database
GPG key ID: 3710727397403C91
5 changed files with 49 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -88,14 +88,18 @@ Item
function generateActiveQualityText()
{
var result = Cura.MachineManager.activeQualityOrQualityChangesName
var result = ""
if(Cura.MachineManager.activeIntentCategory != "default")
// If this is a custom quality, add intent (if present) and quality it is based on
if (Cura.MachineManager.isActiveQualityCustom)
{
result += Cura.MachineManager.activeIntentCategory + " - "
if (Cura.MachineManager.activeIntentName != "")
{
result += " - " + Cura.MachineManager.activeIntentName
}
result += " - " + Cura.MachineManager.activeQualityName
}
result += Cura.MachineManager.activeQualityOrQualityChangesName
if (Cura.MachineManager.isActiveQualityExperimental)
{
result += " (Experimental)"

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

@ -20,13 +20,18 @@ RowLayout
{
if (Cura.MachineManager.activeStack)
{
var text = ""
if(Cura.MachineManager.activeIntentCategory != "default")
var text = Cura.MachineManager.activeQualityOrQualityChangesName
// If this is a custom quality, add intent (if present) and quality it is based on
if (Cura.MachineManager.isActiveQualityCustom)
{
text += Cura.MachineManager.activeIntentCategory + " - "
if (Cura.MachineManager.activeIntentName != "")
{
text += " - " + Cura.MachineManager.activeIntentName
}
text += " - " + Cura.MachineManager.activeQualityName
}
text += Cura.MachineManager.activeQualityOrQualityChangesName
if (!Cura.MachineManager.hasNotSupportedQuality)
{
text += " - " + layerHeight.properties.value + "mm"

6
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
View file

@ -86,7 +86,11 @@ Item
{
id: machineList
cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item.
// CURA-6793
// Enabling the buffer seems to cause the blank items issue. When buffer is enabled, if the ListView's
// individual item has a dynamic change on its visibility, the ListView doesn't redraw itself.
// The default value of cacheBuffer is platform-dependent, so we explicitly disable it here.
cacheBuffer: 0
model: UM.DefinitionContainersModel
{