3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 10:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Rename printersModel to GlobalStacksModel

Browse source 
This is a better description for the model anyway.

CURA-6011
This commit is contained in:
Jaime van Kessel 2018-12-31 11:09:39 +01:00
parent a16e406507
commit fd9b29fee2
5 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/CuraApplication.py
View file

@ -51,7 +51,7 @@ from cura.Arranging.ArrangeObjectsJob import ArrangeObjectsJob
from cura.Arranging.ArrangeObjectsAllBuildPlatesJob import ArrangeObjectsAllBuildPlatesJob from cura.Arranging.ArrangeObjectsAllBuildPlatesJob import ArrangeObjectsAllBuildPlatesJob
from cura.Arranging.ShapeArray import ShapeArray from cura.Arranging.ShapeArray import ShapeArray
from cura.MultiplyObjectsJob import MultiplyObjectsJob from cura.MultiplyObjectsJob import MultiplyObjectsJob
from cura.PrintersModel import PrintersModel from cura.GlobalStacksModel import GlobalStacksModel
from cura.Scene.ConvexHullDecorator import ConvexHullDecorator from cura.Scene.ConvexHullDecorator import ConvexHullDecorator
from cura.Operations.SetParentOperation import SetParentOperation from cura.Operations.SetParentOperation import SetParentOperation
from cura.Scene.SliceableObjectDecorator import SliceableObjectDecorator from cura.Scene.SliceableObjectDecorator import SliceableObjectDecorator
@ -971,7 +971,7 @@ class CuraApplication(QtApplication):
qmlRegisterType(MultiBuildPlateModel, "Cura", 1, 0, "MultiBuildPlateModel") qmlRegisterType(MultiBuildPlateModel, "Cura", 1, 0, "MultiBuildPlateModel")
qmlRegisterType(InstanceContainer, "Cura", 1, 0, "InstanceContainer") qmlRegisterType(InstanceContainer, "Cura", 1, 0, "InstanceContainer")
qmlRegisterType(ExtrudersModel, "Cura", 1, 0, "ExtrudersModel") qmlRegisterType(ExtrudersModel, "Cura", 1, 0, "ExtrudersModel")
qmlRegisterType(PrintersModel, "Cura", 1, 0, "PrintersModel") qmlRegisterType(GlobalStacksModel, "Cura", 1, 0, "GlobalStacksModel")
qmlRegisterType(FavoriteMaterialsModel, "Cura", 1, 0, "FavoriteMaterialsModel") qmlRegisterType(FavoriteMaterialsModel, "Cura", 1, 0, "FavoriteMaterialsModel")
qmlRegisterType(GenericMaterialsModel, "Cura", 1, 0, "GenericMaterialsModel") qmlRegisterType(GenericMaterialsModel, "Cura", 1, 0, "GenericMaterialsModel")

3
cura/PrintersModel.py → cura/GlobalStacksModel.py
View file

@ -12,7 +12,8 @@ from cura.PrinterOutputDevice import ConnectionType
from cura.Settings.GlobalStack import GlobalStack from cura.Settings.GlobalStack import GlobalStack
class PrintersModel(ListModel):
class GlobalStacksModel(ListModel):
NameRole = Qt.UserRole + 1 NameRole = Qt.UserRole + 1
IdRole = Qt.UserRole + 2 IdRole = Qt.UserRole + 2
HasRemoteConnectionRole = Qt.UserRole + 3 HasRemoteConnectionRole = Qt.UserRole + 3

2
resources/qml/Menus/LocalPrinterMenu.qml
View file

@ -9,7 +9,7 @@ import Cura 1.0 as Cura
Instantiator Instantiator
{ {
model: Cura.PrintersModel {} model: Cura.GlobalStacksModel {}
MenuItem MenuItem
{ {

2
resources/qml/Menus/NetworkPrinterMenu.qml
View file

@ -9,7 +9,7 @@ import Cura 1.0 as Cura
Instantiator Instantiator
{ {
model: Cura.PrintersModel {} model: Cura.GlobalStacksModel {}
MenuItem MenuItem
{ {
text: model.metadata["connect_group_name"] text: model.metadata["connect_group_name"]

2
resources/qml/PrinterSelector/MachineSelectorList.qml
View file

@ -11,7 +11,7 @@ ListView
{ {
id: listView id: listView
height: childrenRect.height height: childrenRect.height
model: Cura.PrintersModel {} model: Cura.GlobalStacksModel {}
section.property: "hasRemoteConnection" section.property: "hasRemoteConnection"
section.delegate: Label section.delegate: Label