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

Merge remote-tracking branch 'origin/master' into ui_rework_4_0

Browse source
This commit is contained in:
Lipu Fei 2018-11-29 08:54:22 +01:00
commit 5df7cdde48
37 changed files with 508 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/definitions/cocoon_create_modelmaker.def.json
View file

@ -51,7 +51,7 @@
"default_value": 220
},
"layer_height": {
"default_value": 0.15
"default_value": 0.10
},
"layer_height_0": {
"default_value": 0.2

15
resources/qml/Menus/ProfileMenu.qml
View file

@ -17,18 +17,21 @@ Menu
MenuItem
{
text: (model.layer_height != "") ? model.name + " - " + model.layer_height + model.layer_height_unit : model.name
text:
{
var full_text = (model.layer_height != "") ? model.name + " - " + model.layer_height + model.layer_height_unit : model.name
full_text += model.is_experimental ? " - Experimental" : ""
return full_text
}
checkable: true
checked: Cura.MachineManager.activeQualityOrQualityChangesName == model.name
exclusiveGroup: group
onTriggered: {
Cura.MachineManager.setQualityGroup(model.quality_group)
}
onTriggered: Cura.MachineManager.setQualityGroup(model.quality_group)
visible: model.available
}
onObjectAdded: menu.insertItem(index, object);
onObjectRemoved: menu.removeItem(object);
onObjectAdded: menu.insertItem(index, object)
onObjectRemoved: menu.removeItem(object)
}
MenuSeparator

15
resources/qml/Settings/SettingView.qml
View file

@ -62,11 +62,18 @@ Item
activeFocusOnPress: true
menu: ProfileMenu { }
function generateActiveQualityText () {
var result = Cura.MachineManager.activeQualityOrQualityChangesName;
function generateActiveQualityText ()
{
var result = Cura.MachineManager.activeQualityOrQualityChangesName
if (Cura.MachineManager.isActiveQualityExperimental)
{
result += " (Experimental)"
}
if (Cura.MachineManager.isActiveQualitySupported) {
if (Cura.MachineManager.activeQualityLayerHeight > 0) {
if (Cura.MachineManager.isActiveQualitySupported)
{
if (Cura.MachineManager.activeQualityLayerHeight > 0)
{
result += " <font color=\"" + UM.Theme.getColor("text_detail") + "\">"
result += " - "
result += Cura.MachineManager.activeQualityLayerHeight + "mm"

1
resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = normal
weight = 0
material = generic_pc
variant = AA 0.25
is_experimental = True
[values]
acceleration_enabled = True

1
resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = normal
weight = 0
material = generic_pp
variant = AA 0.25
is_experimental = True
[values]
acceleration_enabled = True

1
resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = draft
weight = -2
material = generic_cpe_plus
variant = AA 0.8
is_experimental = True
[values]
brim_width = 14

1
resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = superdraft
weight = -4
material = generic_cpe_plus
variant = AA 0.8
is_experimental = True
[values]
brim_width = 14

1
resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = verydraft
weight = -3
material = generic_cpe_plus
variant = AA 0.8
is_experimental = True
[values]
brim_width = 14

1
resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = draft
weight = 0
material = generic_pc
variant = AA 0.8
is_experimental = True
[values]
brim_width = 14

1
resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = superdraft
weight = -2
material = generic_pc
variant = AA 0.8
is_experimental = True
[values]
brim_width = 14

1
resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = verydraft
weight = -1
material = generic_pc
variant = AA 0.8
is_experimental = True
[values]
brim_width = 14

1
resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = normal
weight = 0
material = generic_pc
variant = AA 0.25
is_experimental = True
[values]
acceleration_enabled = True

1
resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = normal
weight = 0
material = generic_pp
variant = AA 0.25
is_experimental = True
[values]
acceleration_enabled = True

1
resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = draft
weight = -2
material = generic_cpe_plus
variant = AA 0.8
is_experimental = True
[values]
brim_width = 14

1
resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = superdraft
weight = -4
material = generic_cpe_plus
variant = AA 0.8
is_experimental = True
[values]
brim_width = 14

1
resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = verydraft
weight = -3
material = generic_cpe_plus
variant = AA 0.8
is_experimental = True
[values]
brim_width = 14

1
resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = draft
weight = 0
material = generic_pc
variant = AA 0.8
is_experimental = True
[values]
brim_width = 14

1
resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = superdraft
weight = -2
material = generic_pc
variant = AA 0.8
is_experimental = True
[values]
brim_width = 14

1
resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg
View file

@ -10,6 +10,7 @@ quality_type = verydraft
weight = -1
material = generic_pc
variant = AA 0.8
is_experimental = True
[values]
brim_width = 14

1
resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg
View file

@ -11,6 +11,7 @@ weight = -2
material = generic_cpe_plus
variant = AA 0.8
buildplate = Aluminum
is_experimental = True
[values]
brim_width = 14

1
resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg
View file

@ -11,6 +11,7 @@ weight = 0
material = generic_pc
variant = AA 0.8
buildplate = Aluminum
is_experimental = True
[values]
brim_width = 10