3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Remove a few more usages of deprecated functions

Browse source
This commit is contained in:
Jaime van Kessel 2019-05-16 15:20:38 +02:00
parent 3fe5c9fc6a
commit ff0a18603b
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -160,7 +160,7 @@ Item {
model: UM.SettingDefinitionsModel model: UM.SettingDefinitionsModel
{ {
id: addedSettingsModel; id: addedSettingsModel;
containerId: Cura.MachineManager.activeDefinitionId containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
expanded: [ "*" ] expanded: [ "*" ]
filter: filter:
{ {
@ -467,7 +467,7 @@ Item {
model: UM.SettingDefinitionsModel model: UM.SettingDefinitionsModel
{ {
id: definitionsModel; id: definitionsModel;
containerId: Cura.MachineManager.activeDefinitionId containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
visibilityHandler: UM.SettingPreferenceVisibilityHandler {} visibilityHandler: UM.SettingPreferenceVisibilityHandler {}
expanded: [ "*" ] expanded: [ "*" ]
exclude: exclude:

2
resources/qml/Dialogs/WorkspaceSummaryDialog.qml
View file

@ -50,7 +50,7 @@ UM.Dialog
UM.SettingDefinitionsModel UM.SettingDefinitionsModel
{ {
id: definitionsModel id: definitionsModel
containerId: base.visible ? Cura.MachineManager.activeDefinitionId: "" containerId: base.visible ? Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: "" : ""
showAll: true showAll: true
exclude: ["command_line_settings"] exclude: ["command_line_settings"]
showAncestors: true showAncestors: true

2
resources/qml/Preferences/MachinesPage.qml
View file

@ -25,7 +25,7 @@ UM.ManagementPage
{ {
for(var i = 0; i < model.count; i++) for(var i = 0; i < model.count; i++)
{ {
if (model.getItem(i).id == Cura.MachineManager.activeMachineId) if (model.getItem(i).id == base.activeId)
{ {
return i; return i;
} }

4
resources/qml/Preferences/Materials/MaterialsView.qml
View file

@ -393,7 +393,7 @@ TabView
{ {
model: UM.SettingDefinitionsModel model: UM.SettingDefinitionsModel
{ {
containerId: Cura.MachineManager.activeDefinitionId containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
visibilityHandler: Cura.MaterialSettingsVisibilityHandler { } visibilityHandler: Cura.MaterialSettingsVisibilityHandler { }
expanded: ["*"] expanded: ["*"]
} }
@ -461,7 +461,7 @@ TabView
UM.ContainerPropertyProvider UM.ContainerPropertyProvider
{ {
id: machinePropertyProvider id: machinePropertyProvider
containerId: Cura.MachineManager.activeDefinitionId containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
watchedProperties: [ "value" ] watchedProperties: [ "value" ]
key: model.key key: model.key
} }

2
resources/qml/Preferences/SettingVisibilityPage.qml
View file

@ -151,7 +151,7 @@ UM.PreferencesPage
model: UM.SettingDefinitionsModel model: UM.SettingDefinitionsModel
{ {
id: definitionsModel id: definitionsModel
containerId: Cura.MachineManager.activeDefinitionId containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
showAll: true showAll: true
exclude: ["machine_settings", "command_line_settings"] exclude: ["machine_settings", "command_line_settings"]
showAncestors: true showAncestors: true

2
resources/qml/Settings/SettingView.qml
View file

@ -228,7 +228,7 @@ Item
model: UM.SettingDefinitionsModel model: UM.SettingDefinitionsModel
{ {
id: definitionsModel id: definitionsModel
containerId: Cura.MachineManager.activeDefinitionId containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
visibilityHandler: UM.SettingPreferenceVisibilityHandler { } visibilityHandler: UM.SettingPreferenceVisibilityHandler { }
exclude: ["machine_settings", "command_line_settings", "infill_mesh", "infill_mesh_order", "cutting_mesh", "support_mesh", "anti_overhang_mesh"] // TODO: infill_mesh settigns are excluded hardcoded, but should be based on the fact that settable_globally, settable_per_meshgroup and settable_per_extruder are false. exclude: ["machine_settings", "command_line_settings", "infill_mesh", "infill_mesh_order", "cutting_mesh", "support_mesh", "anti_overhang_mesh"] // TODO: infill_mesh settigns are excluded hardcoded, but should be based on the fact that settable_globally, settable_per_meshgroup and settable_per_extruder are false.
expanded: CuraApplication.expandedCategories expanded: CuraApplication.expandedCategories