CodeStyle

This commit is contained in:
fieldOfView 2016-08-30 14:09:16 +02:00
parent 4593e8615e
commit a8d8a8a7ed

View file

@ -42,12 +42,12 @@ Item {
{ {
id: extruderSelector id: extruderSelector
model: Cura.extruders_model model: Cura.ExtrudersModel
{ {
id: extruders_model id: extrudersModel
onModelChanged: extruderSelector.color = extruders_model.getItem(extruderSelector.currentIndex).color onModelChanged: extruderSelector.color = extrudersModel.getItem(extruderSelector.currentIndex).color
} }
property string color: extruders_model.getItem(extruderSelector.currentIndex).color property string color: extrudersModel.getItem(extruderSelector.currentIndex).color
visible: machineExtruderCount.properties.value > 1 visible: machineExtruderCount.properties.value > 1
textRole: "name" textRole: "name"
width: UM.Theme.getSize("setting_control").width width: UM.Theme.getSize("setting_control").width
@ -128,19 +128,19 @@ Item {
onActivated: onActivated:
{ {
UM.ActiveTool.setProperty("SelectedActiveExtruder", extruders_model.getItem(index).id); UM.ActiveTool.setProperty("SelectedActiveExtruder", extrudersModel.getItem(index).id);
extruderSelector.color = extruders_model.getItem(index).color; extruderSelector.color = extrudersModel.getItem(index).color;
} }
onModelChanged: updateCurrentIndex(); onModelChanged: updateCurrentIndex();
function updateCurrentIndex() function updateCurrentIndex()
{ {
for(var i = 0; i < extruders_model.rowCount(); ++i) for(var i = 0; i < extrudersModel.rowCount(); ++i)
{ {
if(extruders_model.getItem(i).id == UM.ActiveTool.properties.getValue("SelectedActiveExtruder")) if(extrudersModel.getItem(i).id == UM.ActiveTool.properties.getValue("SelectedActiveExtruder"))
{ {
extruderSelector.currentIndex = i; extruderSelector.currentIndex = i;
extruderSelector.color = extruders_model.getItem(i).color; extruderSelector.color = extrudersModel.getItem(i).color;
return; return;
} }
} }