10 Commits

Author SHA1 Message Date
c.lamboo
c73b980a3d Merge branch 'main' into CURA-9422_abstract_cloud_monitor_redux
# Conflicts:
#	resources/qml/PrinterSelector/MachineListButton.qml
2022-08-31 16:05:00 +02:00
Remco Burema
afeec473f6 Small fixes (mostly QML warnings and the like).
done as part of CURA-9422
2022-08-31 14:15:05 +02:00
joeydelarago
19835844bf Change listType -> componentType. Makes it a bit more clear that this variable decides which component should be used for the model.
CURA-9514
2022-08-31 10:50:20 +02:00
joeydelarago
2ff0aed171 Remove height binding loop.
CURA-9514
2022-08-31 10:26:23 +02:00
c.lamboo
60b12b9247 Use list model to display show hide buttons
CURA-9514
2022-08-31 07:58:05 +02:00
c.lamboo
8b84db7059 Remove AbstractMachine
Having a separate class for the AbstractMachine complicated things; it's behaviour was extremely similar to the GlobalStack so adding one more stack container type in addition to the many similar setting container types we already have adds complexity to the system. Having these different classes for machines and abstract machines also add complexity to the update script as the abstract machines were stored in a separate folder from the machine types.

Because of these reasons we decided to replace the AbstractMachine by a GlobalStack where the is_abstract_machine property metadata property is set to True.

CURA-9514, CURA-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-26 10:45:45 +02:00
Joey de l'Arago
2013ad6baf
Update resources/qml/PrinterSelector/MachineListButton.qml
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-08-24 14:22:17 +02:00
joeydelarago
790c373b38 Show icon for offline printers
CURA-9514
2022-08-23 15:57:40 +02:00
joeydelarago
93e2bef303 Group printers by section (Connected Printers/Other Printers)
Cleanup redundant code.

CURA-9514
2022-08-23 15:44:16 +02:00
joeydelarago
b18080c332 Rename AbstractStacksModel.py -> MachineListModel.py since this model includes both abstract machine stacks and regular machines
Add machineCount for displaying the number of machines of a type.

MachineSelectorButton is in use in other places, swapped it out for a new Component MachineListButton.

CURA-9514
2022-08-23 14:29:05 +02:00