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

Added variant selection

Browse source 
CURA-1278
This commit is contained in:
Jaime van Kessel 2016-05-13 10:16:58 +02:00
parent f5e63f2e71
commit b3e741e90c
2 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
resources/qml/SidebarHeader.qml
View file

@ -128,8 +128,8 @@ Item
ToolButton {
id: variantSelection
text: UM.MachineManager.activeMachineVariant
tooltip: UM.MachineManager.activeMachineVariant;
text: Cura.MachineManager.activeVariantName
tooltip: Cura.MachineManager.activeVariantName;
visible: UM.MachineManager.hasVariants
height: UM.Theme.getSize("setting_control").height
@ -143,6 +143,10 @@ Item
Instantiator
{
id: variantSelectionInstantiator
model: UM.InstanceContainersModel
{
filter: {"type": "variant"}
}
// model: UM.MachineVariantsModel { id: variantsModel }
MenuItem
{
@ -152,14 +156,14 @@ Item
exclusiveGroup: variantSelectionMenuGroup;
onTriggered:
{
UM.MachineManager.setActiveMachineVariant(variantsModel.getItem(index).name);
if (typeof(model) !== "undefined" && !model.active) {
Cura.MachineManager.setActiveVariant(model.id);
/*if (typeof(model) !== "undefined" && !model.active) {
//Selecting a variant was canceled; undo menu selection
variantSelectionInstantiator.model.setProperty(index, "active", false);
var activeMachineVariantName = UM.MachineManager.activeMachineVariant;
var activeMachineVariantIndex = variantSelectionInstantiator.model.find("name", activeMachineVariantName);
variantSelectionInstantiator.model.setProperty(activeMachineVariantIndex, "active", true);
}
}*/
}
}
onObjectAdded: variantsSelectionMenu.insertItem(index, object)