From 6dc53eb741d2c3aa97d1dd4a32d99b4a184b877b Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 14 Feb 2018 22:27:54 +0100 Subject: [PATCH] WIP: Fix NozzleMenu extruder binding --- resources/qml/Menus/BuildplateMenu.qml | 4 ++-- resources/qml/Menus/NozzleMenu.qml | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/resources/qml/Menus/BuildplateMenu.qml b/resources/qml/Menus/BuildplateMenu.qml index 4b85aa9e93..2679eec1d1 100644 --- a/resources/qml/Menus/BuildplateMenu.qml +++ b/resources/qml/Menus/BuildplateMenu.qml @@ -1,8 +1,8 @@ // Copyright (c) 2018 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick 2.8 +import QtQuick.Controls 1.4 import UM 1.2 as UM import Cura 1.0 as Cura diff --git a/resources/qml/Menus/NozzleMenu.qml b/resources/qml/Menus/NozzleMenu.qml index 8cb01fcde6..d3ddbb8473 100644 --- a/resources/qml/Menus/NozzleMenu.qml +++ b/resources/qml/Menus/NozzleMenu.qml @@ -1,8 +1,8 @@ // Copyright (c) 2017 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick 2.8 +import QtQuick.Controls 1.4 import UM 1.2 as UM import Cura 1.0 as Cura @@ -27,11 +27,10 @@ Menu { text: model.hotend_name checkable: true - checked: Cura.MachineManager.activeVariantName == model.hotend_name + checked: Cura.MachineManager.activeMachine.extruders[extruderIndex].variant.name == model.hotend_name exclusiveGroup: group onTriggered: { - var position = Cura.ExtruderManager.activeExtruderIndex; - Cura.MachineManager.setVariantGroup(position, model.container_node); + Cura.MachineManager.setVariantGroup(extruderIndex, model.container_node); } }