Fix PerObjectSettings to use the right objects when instantiating setting items

Contributes to CURA-1592
This commit is contained in:
Arjen Hiemstra 2016-06-07 13:17:35 +02:00
parent 51ea6779df
commit ca1b199c7e

View file

@ -64,24 +64,26 @@ Item {
settingLoader.item.doDepthIdentation = false settingLoader.item.doDepthIdentation = false
} }
source: sourceComponent:
{ {
switch(model.type) // TODO: This needs to be fixed properly. Got frustrated with it not working, so this is the patch job! switch(model.type)
{ {
case "int": case "int":
return "../../resources/qml/Settings/SettingTextField.qml" return settingTextField
case "float": case "float":
return "../../resources/qml/Settings/SettingTextField.qml" return settingTextField
case "enum": case "enum":
return "../../resources/qml/Settings/SettingComboBox.qml" return settingComboBox
case "extruder":
return settingExtruder
case "bool": case "bool":
return "../../resources/qml/Settings/SettingCheckBox.qml" return settingCheckBox
case "str": case "str":
return "../../resources/qml/Settings/SettingTextField.qml" return settingTextField
case "category": case "category":
return "../../resources/qml/Settings/SettingCategory.qml" return settingCategory
default: default:
return "../../resources/qml/Settings/SettingUnknown.qml" return settingUnknown
} }
} }
} }
@ -257,4 +259,46 @@ Item {
} }
SystemPalette { id: palette; } SystemPalette { id: palette; }
Component
{
id: settingTextField;
Cura.SettingTextField { }
}
Component
{
id: settingComboBox;
Cura.SettingComboBox { }
}
Component
{
id: settingExtruder;
Cura.SettingExtruder { }
}
Component
{
id: settingCheckBox;
Cura.SettingCheckBox { }
}
Component
{
id: settingCategory;
Cura.SettingCategory { }
}
Component
{
id: settingUnknown;
Cura.SettingUnknown { }
}
} }