Use MachineManager and PropertyProvider to restore several bits of behavioiur

This commit is contained in:
Arjen Hiemstra 2016-05-16 18:13:20 +02:00
parent 442d2b6e71
commit b1df8e9448

View file

@ -7,6 +7,7 @@ import QtQuick.Controls.Styles 1.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura
import ".." import ".."
@ -26,14 +27,18 @@ ScrollView
id: contents id: contents
spacing: UM.Theme.getSize("default_lining").height; spacing: UM.Theme.getSize("default_lining").height;
model: UM.SettingDefinitionsModel { id: definitionsModel; containerId: "fdmprinter" } model: UM.SettingDefinitionsModel { id: definitionsModel; containerId: Cura.MachineManager.activeDefinitionId }
delegate: Loader delegate: Loader
{ {
id: delegate id: delegate
width: UM.Theme.getSize("sidebar").width; width: UM.Theme.getSize("sidebar").width;
height: UM.Theme.getSize("section").height; height: provider.properties.enabled ? UM.Theme.getSize("section").height : 0
Behavior on height { NumberAnimation { duration: 100 } }
opacity: provider.properties.enabled ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } }
enabled: provider.properties.enabled
property var definition: model property var definition: model
property var settingDefinitionsModel: definitionsModel property var settingDefinitionsModel: definitionsModel
@ -66,12 +71,10 @@ ScrollView
{ {
id: provider id: provider
containerStackId: "" containerStackId: Cura.MachineManager.activeMachineId
key: model.key key: model.key
watchedProperties: [ "value", "enabled", "state", "validationState" ] watchedProperties: [ "value", "enabled", "state", "validationState" ]
storeIndex: 0
} }
Connections Connections