mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-12-05 16:51:12 -07:00
Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown
This commit is contained in:
Diego Prado Gesto
commit
260c0a04ca
47 changed files with 528 additions and 113 deletions
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"name": "Cocoon Create ModelMaker & Wanhao Duplicator i3 Mini",
|
||||
"name": "Cocoon Create ModelMaker",
|
||||
"version": 2,
|
||||
"inherits": "fdmprinter",
|
||||
"metadata": {
|
||||
"visible": true,
|
||||
"author": "Samuel Pinches",
|
||||
"manufacturer": "Cocoon Create / Wanhao",
|
||||
"manufacturer": "Cocoon Create",
|
||||
"file_formats": "text/x-gcode",
|
||||
"preferred_quality_type": "fine",
|
||||
"machine_extruder_trains":
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
},
|
||||
"overrides": {
|
||||
"machine_name": {
|
||||
"default_value": "Cocoon Create ModelMaker & Wanhao Duplicator i3 Mini"
|
||||
"default_value": "Cocoon Create ModelMaker"
|
||||
},
|
||||
"machine_start_gcode": {
|
||||
"default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --"
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
"default_value": 220
|
||||
},
|
||||
"layer_height": {
|
||||
"default_value": 0.15
|
||||
"default_value": 0.10
|
||||
},
|
||||
"layer_height_0": {
|
||||
"default_value": 0.2
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ Column
|
|||
Column
|
||||
{
|
||||
id: timeSpecification
|
||||
spacing: UM.Theme.getSize("thin_margin").width
|
||||
width: parent.width
|
||||
topPadding: UM.Theme.getSize("default_margin").height
|
||||
leftPadding: UM.Theme.getSize("default_margin").width
|
||||
|
|
@ -71,7 +70,6 @@ Column
|
|||
Column
|
||||
{
|
||||
id: materialSpecification
|
||||
spacing: UM.Theme.getSize("thin_margin").width
|
||||
width: parent.width
|
||||
bottomPadding: UM.Theme.getSize("default_margin").height
|
||||
leftPadding: UM.Theme.getSize("default_margin").width
|
||||
|
|
|
|||
|
|
@ -213,28 +213,6 @@ UM.Dialog
|
|||
|
||||
PropertyChanges { target: machineButton; opacity: 0; height: 0; }
|
||||
}
|
||||
|
||||
transitions:
|
||||
[
|
||||
Transition
|
||||
{
|
||||
to: "collapsed";
|
||||
SequentialAnimation
|
||||
{
|
||||
NumberAnimation { property: "opacity"; duration: 75; }
|
||||
NumberAnimation { property: "height"; duration: 75; }
|
||||
}
|
||||
},
|
||||
Transition
|
||||
{
|
||||
from: "collapsed";
|
||||
SequentialAnimation
|
||||
{
|
||||
NumberAnimation { property: "height"; duration: 75; }
|
||||
NumberAnimation { property: "opacity"; duration: 75; }
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -151,7 +151,6 @@ UM.PreferencesPage
|
|||
{
|
||||
id: languageLabel
|
||||
text: catalog.i18nc("@label","Language:")
|
||||
anchors.verticalCenter: languageComboBox.verticalCenter
|
||||
}
|
||||
|
||||
ComboBox
|
||||
|
|
@ -219,7 +218,6 @@ UM.PreferencesPage
|
|||
{
|
||||
id: currencyLabel
|
||||
text: catalog.i18nc("@label","Currency:")
|
||||
anchors.verticalCenter: currencyField.verticalCenter
|
||||
}
|
||||
|
||||
TextField
|
||||
|
|
@ -233,7 +231,6 @@ UM.PreferencesPage
|
|||
{
|
||||
id: themeLabel
|
||||
text: catalog.i18nc("@label","Theme:")
|
||||
anchors.verticalCenter: themeComboBox.verticalCenter
|
||||
}
|
||||
|
||||
ComboBox
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ UM.PreferencesPage
|
|||
{
|
||||
for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i)
|
||||
{
|
||||
if(settingVisibilityPresetsModel.items[i].id == settingVisibilityPresetsModel.activePreset)
|
||||
if(settingVisibilityPresetsModel.items[i].presetId == settingVisibilityPresetsModel.activePreset)
|
||||
{
|
||||
currentIndex = i;
|
||||
return;
|
||||
|
|
@ -128,8 +128,8 @@ UM.PreferencesPage
|
|||
|
||||
onActivated:
|
||||
{
|
||||
var preset_id = settingVisibilityPresetsModel.items[index].id;
|
||||
settingVisibilityPresetsModel.setActivePreset(preset_id);
|
||||
var preset_id = settingVisibilityPresetsModel.items[index].presetId
|
||||
settingVisibilityPresetsModel.setActivePreset(preset_id)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = normal
|
|||
weight = 0
|
||||
material = generic_pc
|
||||
variant = AA 0.25
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
acceleration_enabled = True
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = normal
|
|||
weight = 0
|
||||
material = generic_pp
|
||||
variant = AA 0.25
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
acceleration_enabled = True
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = draft
|
|||
weight = -2
|
||||
material = generic_cpe_plus
|
||||
variant = AA 0.8
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 14
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = superdraft
|
|||
weight = -4
|
||||
material = generic_cpe_plus
|
||||
variant = AA 0.8
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 14
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = verydraft
|
|||
weight = -3
|
||||
material = generic_cpe_plus
|
||||
variant = AA 0.8
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 14
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = draft
|
|||
weight = 0
|
||||
material = generic_pc
|
||||
variant = AA 0.8
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 14
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = superdraft
|
|||
weight = -2
|
||||
material = generic_pc
|
||||
variant = AA 0.8
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 14
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = verydraft
|
|||
weight = -1
|
||||
material = generic_pc
|
||||
variant = AA 0.8
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 14
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = normal
|
|||
weight = 0
|
||||
material = generic_pc
|
||||
variant = AA 0.25
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
acceleration_enabled = True
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = normal
|
|||
weight = 0
|
||||
material = generic_pp
|
||||
variant = AA 0.25
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
acceleration_enabled = True
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = draft
|
|||
weight = -2
|
||||
material = generic_cpe_plus
|
||||
variant = AA 0.8
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 14
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = superdraft
|
|||
weight = -4
|
||||
material = generic_cpe_plus
|
||||
variant = AA 0.8
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 14
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = verydraft
|
|||
weight = -3
|
||||
material = generic_cpe_plus
|
||||
variant = AA 0.8
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 14
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = draft
|
|||
weight = 0
|
||||
material = generic_pc
|
||||
variant = AA 0.8
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 14
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = superdraft
|
|||
weight = -2
|
||||
material = generic_pc
|
||||
variant = AA 0.8
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 14
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ quality_type = verydraft
|
|||
weight = -1
|
||||
material = generic_pc
|
||||
variant = AA 0.8
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 14
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ weight = -2
|
|||
material = generic_cpe_plus
|
||||
variant = AA 0.8
|
||||
buildplate = Aluminum
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 14
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ weight = 0
|
|||
material = generic_pc
|
||||
variant = AA 0.8
|
||||
buildplate = Aluminum
|
||||
is_experimental = True
|
||||
|
||||
[values]
|
||||
brim_width = 10
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue