GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 10:45:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2016-07-28 14:03:25 +02:00
commit 305a47e9b0
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/definitions/fdmprinter.def.json
View File

@ -3346,8 +3346,8 @@
"type": "float", "type": "float",
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "9999", "maximum_value_warning": "9999",
"default_value": 0, "default_value": 10,
"value": "9999 if draft_shield_height_limitation == 'full' and draft_shield_enabled else 0.0", "value": "10",
"enabled": "draft_shield_enabled and draft_shield_height_limitation == \"limited\"", "enabled": "draft_shield_enabled and draft_shield_height_limitation == \"limited\"",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false "settable_per_extruder": false

6
resources/qml/Settings/SettingComboBox.qml
View File

@ -86,18 +86,18 @@ SettingItem
} }
} }
onActivated: { forceActiveFocus(); provider.setPropertyValue("value", definition.options[index].key) } onActivated: { forceActiveFocus(); propertyProvider.setPropertyValue("value", definition.options[index].key) }
onModelChanged: updateCurrentIndex(); onModelChanged: updateCurrentIndex();
Connections Connections
{ {
target: provider target: propertyProvider
onPropertiesChanged: control.updateCurrentIndex() onPropertiesChanged: control.updateCurrentIndex()
} }
function updateCurrentIndex() { function updateCurrentIndex() {
for(var i = 0; i < definition.options.length; ++i) { for(var i = 0; i < definition.options.length; ++i) {
if(definition.options[i].key == provider.properties.value) { if(definition.options[i].key == propertyProvider.properties.value) {
currentIndex = i; currentIndex = i;
return; return;
} }

6
resources/qml/Settings/SettingExtruder.qml
View File

@ -105,13 +105,13 @@ SettingItem
onActivated: onActivated:
{ {
forceActiveFocus(); forceActiveFocus();
provider.setPropertyValue("value", extruders_model.getItem(index).index) propertyProvider.setPropertyValue("value", extruders_model.getItem(index).index)
} }
onModelChanged: updateCurrentIndex(); onModelChanged: updateCurrentIndex();
Connections Connections
{ {
target: provider target: propertyProvider
onPropertiesChanged: control.updateCurrentIndex(); onPropertiesChanged: control.updateCurrentIndex();
} }
@ -119,7 +119,7 @@ SettingItem
{ {
for(var i = 0; i < extruders_model.rowCount(); ++i) for(var i = 0; i < extruders_model.rowCount(); ++i)
{ {
if(extruders_model.getItem(i).index == provider.properties.value) if(extruders_model.getItem(i).index == propertyProvider.properties.value)
{ {
currentIndex = i; currentIndex = i;
return; return;