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

Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership

Browse source 
part of CURA-8591
This commit is contained in:
Remco Burema 2021-12-28 14:54:56 +01:00
parent abe7c1bf7f
commit 32b52c6166
No known key found for this signature in database
GPG key ID: 215C49431D43F98C
25 changed files with 167 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Machines/MachineNode.py
View file

@ -129,7 +129,7 @@ class MachineNode(ContainerNode):
if name not in groups_by_name: if name not in groups_by_name:
# CURA-6599 # CURA-6599
# For some reason, QML will get null or fail to convert type for MachineManager.activeQualityChangesGroup() to # For some reason, QML will get null or fail to convert type for MachineManager.activeQualityChangesGroup() to
# a QObject. Setting the object ownership to QQmlEngine.CppOwnership doesn't work, but setting the object # a QObject. Setting the object ownership to QQmlEngine.ObjectOwnership.CppOwnership doesn't work, but setting the object
# parent to application seems to work. # parent to application seems to work.
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
groups_by_name[name] = QualityChangesGroup(name, quality_type = quality_changes["quality_type"], groups_by_name[name] = QualityChangesGroup(name, quality_type = quality_changes["quality_type"],

32
cura/Machines/Models/BaseMaterialsModel.py
View file

@ -61,22 +61,22 @@ class BaseMaterialsModel(ListModel):
ContainerTree.getInstance().materialsChanged.connect(self._materialsListChanged) ContainerTree.getInstance().materialsChanged.connect(self._materialsListChanged)
self._application.getMaterialManagementModel().favoritesChanged.connect(self._onChanged) self._application.getMaterialManagementModel().favoritesChanged.connect(self._onChanged)
self.addRoleName(Qt.UserRole + 1, "root_material_id") self.addRoleName(Qt.ItemDataRole.UserRole + 1, "root_material_id")
self.addRoleName(Qt.UserRole + 2, "id") self.addRoleName(Qt.ItemDataRole.UserRole + 2, "id")
self.addRoleName(Qt.UserRole + 3, "GUID") self.addRoleName(Qt.ItemDataRole.UserRole + 3, "GUID")
self.addRoleName(Qt.UserRole + 4, "name") self.addRoleName(Qt.ItemDataRole.UserRole + 4, "name")
self.addRoleName(Qt.UserRole + 5, "brand") self.addRoleName(Qt.ItemDataRole.UserRole + 5, "brand")
self.addRoleName(Qt.UserRole + 6, "description") self.addRoleName(Qt.ItemDataRole.UserRole + 6, "description")
self.addRoleName(Qt.UserRole + 7, "material") self.addRoleName(Qt.ItemDataRole.UserRole + 7, "material")
self.addRoleName(Qt.UserRole + 8, "color_name") self.addRoleName(Qt.ItemDataRole.UserRole + 8, "color_name")
self.addRoleName(Qt.UserRole + 9, "color_code") self.addRoleName(Qt.ItemDataRole.UserRole + 9, "color_code")
self.addRoleName(Qt.UserRole + 10, "density") self.addRoleName(Qt.ItemDataRole.UserRole + 10, "density")
self.addRoleName(Qt.UserRole + 11, "diameter") self.addRoleName(Qt.ItemDataRole.UserRole + 11, "diameter")
self.addRoleName(Qt.UserRole + 12, "approximate_diameter") self.addRoleName(Qt.ItemDataRole.UserRole + 12, "approximate_diameter")
self.addRoleName(Qt.UserRole + 13, "adhesion_info") self.addRoleName(Qt.ItemDataRole.UserRole + 13, "adhesion_info")
self.addRoleName(Qt.UserRole + 14, "is_read_only") self.addRoleName(Qt.ItemDataRole.UserRole + 14, "is_read_only")
self.addRoleName(Qt.UserRole + 15, "container_node") self.addRoleName(Qt.ItemDataRole.UserRole + 15, "container_node")
self.addRoleName(Qt.UserRole + 16, "is_favorite") self.addRoleName(Qt.ItemDataRole.UserRole + 16, "is_favorite")
def _onChanged(self) -> None: def _onChanged(self) -> None:
self._update_timer.start() self._update_timer.start()

4
cura/Machines/Models/BuildPlateModel.py
View file

@ -7,8 +7,8 @@ from UM.Qt.ListModel import ListModel
class BuildPlateModel(ListModel): class BuildPlateModel(ListModel):
NameRole = Qt.UserRole + 1 NameRole = Qt.ItemDataRole.UserRole + 1
ContainerNodeRole = Qt.UserRole + 2 ContainerNodeRole = Qt.ItemDataRole.UserRole + 2
def __init__(self, parent = None): def __init__(self, parent = None):
super().__init__(parent) super().__init__(parent)

8
cura/Machines/Models/DiscoveredCloudPrintersModel.py
View file

@ -12,10 +12,10 @@ class DiscoveredCloudPrintersModel(ListModel):
"""Model used to inform the application about newly added cloud printers, which are discovered from the user's """Model used to inform the application about newly added cloud printers, which are discovered from the user's
account """ account """
DeviceKeyRole = Qt.UserRole + 1 DeviceKeyRole = Qt.ItemDataRole.UserRole + 1
DeviceNameRole = Qt.UserRole + 2 DeviceNameRole = Qt.ItemDataRole.UserRole + 2
DeviceTypeRole = Qt.UserRole + 3 DeviceTypeRole = Qt.ItemDataRole.UserRole + 3
DeviceFirmwareVersionRole = Qt.UserRole + 4 DeviceFirmwareVersionRole = Qt.ItemDataRole.UserRole + 4
cloudPrintersDetectedChanged = pyqtSignal(bool) cloudPrintersDetectedChanged = pyqtSignal(bool)

26
cura/Machines/Models/ExtrudersModel.py
View file

@ -23,43 +23,43 @@ class ExtrudersModel(ListModel):
""" """
# The ID of the container stack for the extruder. # The ID of the container stack for the extruder.
IdRole = Qt.UserRole + 1 IdRole = Qt.ItemDataRole.UserRole + 1
NameRole = Qt.UserRole + 2 NameRole = Qt.ItemDataRole.UserRole + 2
"""Human-readable name of the extruder.""" """Human-readable name of the extruder."""
ColorRole = Qt.UserRole + 3 ColorRole = Qt.ItemDataRole.UserRole + 3
"""Colour of the material loaded in the extruder.""" """Colour of the material loaded in the extruder."""
IndexRole = Qt.UserRole + 4 IndexRole = Qt.ItemDataRole.UserRole + 4
"""Index of the extruder, which is also the value of the setting itself. """Index of the extruder, which is also the value of the setting itself.
An index of 0 indicates the first extruder, an index of 1 the second one, and so on. This is the value that will An index of 0 indicates the first extruder, an index of 1 the second one, and so on. This is the value that will
be saved in instance containers. """ be saved in instance containers. """
# The ID of the definition of the extruder. # The ID of the definition of the extruder.
DefinitionRole = Qt.UserRole + 5 DefinitionRole = Qt.ItemDataRole.UserRole + 5
# The material of the extruder. # The material of the extruder.
MaterialRole = Qt.UserRole + 6 MaterialRole = Qt.ItemDataRole.UserRole + 6
# The variant of the extruder. # The variant of the extruder.
VariantRole = Qt.UserRole + 7 VariantRole = Qt.ItemDataRole.UserRole + 7
StackRole = Qt.UserRole + 8 StackRole = Qt.ItemDataRole.UserRole + 8
MaterialBrandRole = Qt.UserRole + 9 MaterialBrandRole = Qt.ItemDataRole.UserRole + 9
ColorNameRole = Qt.UserRole + 10 ColorNameRole = Qt.ItemDataRole.UserRole + 10
EnabledRole = Qt.UserRole + 11 EnabledRole = Qt.ItemDataRole.UserRole + 11
"""Is the extruder enabled?""" """Is the extruder enabled?"""
MaterialTypeRole = Qt.UserRole + 12 MaterialTypeRole = Qt.ItemDataRole.UserRole + 12
"""The type of the material (e.g. PLA, ABS, PETG, etc.).""" """The type of the material (e.g. PLA, ABS, PETG, etc.)."""
defaultColors = ["#ffc924", "#86ec21", "#22eeee", "#245bff", "#9124ff", "#ff24c8"] defaultColors = ["#ffc924", "#86ec21", "#22eeee", "#245bff", "#9124ff", "#ff24c8"]
"""List of colours to display if there is no material or the material has no known colour. """ """List of colours to display if there is no material or the material has no known colour. """
MaterialNameRole = Qt.UserRole + 13 MaterialNameRole = Qt.ItemDataRole.UserRole + 13
def __init__(self, parent = None): def __init__(self, parent = None):
"""Initialises the extruders model, defining the roles and listening for changes in the data. """Initialises the extruders model, defining the roles and listening for changes in the data.

6
cura/Machines/Models/FirstStartMachineActionsModel.py
View file

@ -19,9 +19,9 @@ class FirstStartMachineActionsModel(ListModel):
- action : the MachineAction object itself - action : the MachineAction object itself
""" """
TitleRole = Qt.UserRole + 1 TitleRole = Qt.ItemDataRole.UserRole + 1
ContentRole = Qt.UserRole + 2 ContentRole = Qt.ItemDataRole.UserRole + 2
ActionRole = Qt.UserRole + 3 ActionRole = Qt.ItemDataRole.UserRole + 3
def __init__(self, application: "CuraApplication", parent: Optional[QObject] = None) -> None: def __init__(self, application: "CuraApplication", parent: Optional[QObject] = None) -> None:
super().__init__(parent) super().__init__(parent)

16
cura/Machines/Models/GlobalStacksModel.py
View file

@ -15,14 +15,14 @@ from cura.UltimakerCloud.UltimakerCloudConstants import META_CAPABILITIES # To
class GlobalStacksModel(ListModel): class GlobalStacksModel(ListModel):
NameRole = Qt.UserRole + 1 NameRole = Qt.ItemDataRole.UserRole + 1
IdRole = Qt.UserRole + 2 IdRole = Qt.ItemDataRole.UserRole + 2
HasRemoteConnectionRole = Qt.UserRole + 3 HasRemoteConnectionRole = Qt.ItemDataRole.UserRole + 3
ConnectionTypeRole = Qt.UserRole + 4 ConnectionTypeRole = Qt.ItemDataRole.UserRole + 4
MetaDataRole = Qt.UserRole + 5 MetaDataRole = Qt.ItemDataRole.UserRole + 5
DiscoverySourceRole = Qt.UserRole + 6 # For separating local and remote printers in the machine management page DiscoverySourceRole = Qt.ItemDataRole.UserRole + 6 # For separating local and remote printers in the machine management page
RemovalWarningRole = Qt.UserRole + 7 RemovalWarningRole = Qt.ItemDataRole.UserRole + 7
IsOnlineRole = Qt.UserRole + 8 IsOnlineRole = Qt.ItemDataRole.UserRole + 8
def __init__(self, parent = None) -> None: def __init__(self, parent = None) -> None:
super().__init__(parent) super().__init__(parent)

10
cura/Machines/Models/IntentCategoryModel.py
View file

@ -21,11 +21,11 @@ catalog = i18nCatalog("cura")
class IntentCategoryModel(ListModel): class IntentCategoryModel(ListModel):
"""Lists the intent categories that are available for the current printer configuration. """ """Lists the intent categories that are available for the current printer configuration. """
NameRole = Qt.UserRole + 1 NameRole = Qt.ItemDataRole.UserRole + 1
IntentCategoryRole = Qt.UserRole + 2 IntentCategoryRole = Qt.ItemDataRole.UserRole + 2
WeightRole = Qt.UserRole + 3 WeightRole = Qt.ItemDataRole.UserRole + 3
QualitiesRole = Qt.UserRole + 4 QualitiesRole = Qt.ItemDataRole.UserRole + 4
DescriptionRole = Qt.UserRole + 5 DescriptionRole = Qt.ItemDataRole.UserRole + 5
modelUpdated = pyqtSignal() modelUpdated = pyqtSignal()

10
cura/Machines/Models/IntentModel.py
View file

@ -15,11 +15,11 @@ from cura.Machines.QualityGroup import QualityGroup
class IntentModel(ListModel): class IntentModel(ListModel):
NameRole = Qt.UserRole + 1 NameRole = Qt.ItemDataRole.UserRole + 1
QualityTypeRole = Qt.UserRole + 2 QualityTypeRole = Qt.ItemDataRole.UserRole + 2
LayerHeightRole = Qt.UserRole + 3 LayerHeightRole = Qt.ItemDataRole.UserRole + 3
AvailableRole = Qt.UserRole + 4 AvailableRole = Qt.ItemDataRole.UserRole + 4
IntentRole = Qt.UserRole + 5 IntentRole = Qt.ItemDataRole.UserRole + 5
def __init__(self, parent: Optional[QObject] = None) -> None: def __init__(self, parent: Optional[QObject] = None) -> None:
super().__init__(parent) super().__init__(parent)

10
cura/Machines/Models/MaterialBrandsModel.py
View file

@ -10,9 +10,9 @@ class MaterialTypesModel(ListModel):
def __init__(self, parent = None): def __init__(self, parent = None):
super().__init__(parent) super().__init__(parent)
self.addRoleName(Qt.UserRole + 1, "name") self.addRoleName(Qt.ItemDataRole.UserRole + 1, "name")
self.addRoleName(Qt.UserRole + 2, "brand") self.addRoleName(Qt.ItemDataRole.UserRole + 2, "brand")
self.addRoleName(Qt.UserRole + 3, "colors") self.addRoleName(Qt.ItemDataRole.UserRole + 3, "colors")
class MaterialBrandsModel(BaseMaterialsModel): class MaterialBrandsModel(BaseMaterialsModel):
@ -21,8 +21,8 @@ class MaterialBrandsModel(BaseMaterialsModel):
def __init__(self, parent = None): def __init__(self, parent = None):
super().__init__(parent) super().__init__(parent)
self.addRoleName(Qt.UserRole + 1, "name") self.addRoleName(Qt.ItemDataRole.UserRole + 1, "name")
self.addRoleName(Qt.UserRole + 2, "material_types") self.addRoleName(Qt.ItemDataRole.UserRole + 2, "material_types")
self._update() self._update()

6
cura/Machines/Models/NozzleModel.py
View file

@ -10,9 +10,9 @@ from cura.Machines.ContainerTree import ContainerTree
class NozzleModel(ListModel): class NozzleModel(ListModel):
IdRole = Qt.UserRole + 1 IdRole = Qt.ItemDataRole.UserRole + 1
HotendNameRole = Qt.UserRole + 2 HotendNameRole = Qt.ItemDataRole.UserRole + 2
ContainerNodeRole = Qt.UserRole + 3 ContainerNodeRole = Qt.ItemDataRole.UserRole + 3
def __init__(self, parent = None): def __init__(self, parent = None):
super().__init__(parent) super().__init__(parent)

14
cura/Machines/Models/QualityManagementModel.py
View file

@ -29,13 +29,13 @@ if TYPE_CHECKING:
class QualityManagementModel(ListModel): class QualityManagementModel(ListModel):
"""This the QML model for the quality management page.""" """This the QML model for the quality management page."""
NameRole = Qt.UserRole + 1 NameRole = Qt.ItemDataRole.UserRole + 1
IsReadOnlyRole = Qt.UserRole + 2 IsReadOnlyRole = Qt.ItemDataRole.UserRole + 2
QualityGroupRole = Qt.UserRole + 3 QualityGroupRole = Qt.ItemDataRole.UserRole + 3
QualityTypeRole = Qt.UserRole + 4 QualityTypeRole = Qt.ItemDataRole.UserRole + 4
QualityChangesGroupRole = Qt.UserRole + 5 QualityChangesGroupRole = Qt.ItemDataRole.UserRole + 5
IntentCategoryRole = Qt.UserRole + 6 IntentCategoryRole = Qt.ItemDataRole.UserRole + 6
SectionNameRole = Qt.UserRole + 7 SectionNameRole = Qt.ItemDataRole.UserRole + 7
def __init__(self, parent: Optional["QObject"] = None) -> None: def __init__(self, parent: Optional["QObject"] = None) -> None:
super().__init__(parent) super().__init__(parent)

16
cura/Machines/Models/QualityProfilesDropDownMenuModel.py
View file

@ -13,14 +13,14 @@ from cura.Machines.Models.MachineModelUtils import fetchLayerHeight
class QualityProfilesDropDownMenuModel(ListModel): class QualityProfilesDropDownMenuModel(ListModel):
"""QML Model for all built-in quality profiles. This model is used for the drop-down quality menu.""" """QML Model for all built-in quality profiles. This model is used for the drop-down quality menu."""
NameRole = Qt.UserRole + 1 NameRole = Qt.ItemDataRole.UserRole + 1
QualityTypeRole = Qt.UserRole + 2 QualityTypeRole = Qt.ItemDataRole.UserRole + 2
LayerHeightRole = Qt.UserRole + 3 LayerHeightRole = Qt.ItemDataRole.UserRole + 3
LayerHeightUnitRole = Qt.UserRole + 4 LayerHeightUnitRole = Qt.ItemDataRole.UserRole + 4
AvailableRole = Qt.UserRole + 5 AvailableRole = Qt.ItemDataRole.UserRole + 5
QualityGroupRole = Qt.UserRole + 6 QualityGroupRole = Qt.ItemDataRole.UserRole + 6
QualityChangesGroupRole = Qt.UserRole + 7 QualityChangesGroupRole = Qt.ItemDataRole.UserRole + 7
IsExperimentalRole = Qt.UserRole + 8 IsExperimentalRole = Qt.ItemDataRole.UserRole + 8
def __init__(self, parent = None): def __init__(self, parent = None):
super().__init__(parent) super().__init__(parent)

14
cura/Machines/Models/QualitySettingsModel.py
View file

@ -16,13 +16,13 @@ import os
class QualitySettingsModel(ListModel): class QualitySettingsModel(ListModel):
"""This model is used to show details settings of the selected quality in the quality management page.""" """This model is used to show details settings of the selected quality in the quality management page."""
KeyRole = Qt.UserRole + 1 KeyRole = Qt.ItemDataRole.UserRole + 1
LabelRole = Qt.UserRole + 2 LabelRole = Qt.ItemDataRole.UserRole + 2
UnitRole = Qt.UserRole + 3 UnitRole = Qt.ItemDataRole.UserRole + 3
ProfileValueRole = Qt.UserRole + 4 ProfileValueRole = Qt.ItemDataRole.UserRole + 4
ProfileValueSourceRole = Qt.UserRole + 5 ProfileValueSourceRole = Qt.ItemDataRole.UserRole + 5
UserValueRole = Qt.UserRole + 6 UserValueRole = Qt.ItemDataRole.UserRole + 6
CategoryRole = Qt.UserRole + 7 CategoryRole = Qt.ItemDataRole.UserRole + 7
GLOBAL_STACK_POSITION = -1 GLOBAL_STACK_POSITION = -1

12
cura/Machines/Models/UserChangesModel.py
View file

@ -15,12 +15,12 @@ from UM.Qt.ListModel import ListModel
class UserChangesModel(ListModel): class UserChangesModel(ListModel):
KeyRole = Qt.UserRole + 1 KeyRole = Qt.ItemDataRole.UserRole + 1
LabelRole = Qt.UserRole + 2 LabelRole = Qt.ItemDataRole.UserRole + 2
ExtruderRole = Qt.UserRole + 3 ExtruderRole = Qt.ItemDataRole.UserRole + 3
OriginalValueRole = Qt.UserRole + 4 OriginalValueRole = Qt.ItemDataRole.UserRole + 4
UserValueRole = Qt.UserRole + 6 UserValueRole = Qt.ItemDataRole.UserRole + 6
CategoryRole = Qt.UserRole + 7 CategoryRole = Qt.ItemDataRole.UserRole + 7
def __init__(self, parent = None): def __init__(self, parent = None):
super().__init__(parent = parent) super().__init__(parent = parent)

8
cura/Settings/SidebarCustomMenuItemsModel.py
View file

@ -8,10 +8,10 @@ from PyQt6.QtCore import pyqtSlot, Qt
class SidebarCustomMenuItemsModel(ListModel): class SidebarCustomMenuItemsModel(ListModel):
name_role = Qt.UserRole + 1 name_role = Qt.ItemDataRole.UserRole + 1
actions_role = Qt.UserRole + 2 actions_role = Qt.ItemDataRole.UserRole + 2
menu_item_role = Qt.UserRole + 3 menu_item_role = Qt.ItemDataRole.UserRole + 3
menu_item_icon_name_role = Qt.UserRole + 5 menu_item_icon_name_role = Qt.ItemDataRole.UserRole + 5
def __init__(self, parent=None): def __init__(self, parent=None):
super().__init__(parent) super().__init__(parent)

16
cura/UI/ObjectsModel.py
View file

@ -34,14 +34,14 @@ class _NodeInfo:
class ObjectsModel(ListModel): class ObjectsModel(ListModel):
"""Keep track of all objects in the project""" """Keep track of all objects in the project"""
NameRole = Qt.UserRole + 1 NameRole = Qt.ItemDataRole.UserRole + 1
SelectedRole = Qt.UserRole + 2 SelectedRole = Qt.ItemDataRole.UserRole + 2
OutsideAreaRole = Qt.UserRole + 3 OutsideAreaRole = Qt.ItemDataRole.UserRole + 3
BuilplateNumberRole = Qt.UserRole + 4 BuilplateNumberRole = Qt.ItemDataRole.UserRole + 4
NodeRole = Qt.UserRole + 5 NodeRole = Qt.ItemDataRole.UserRole + 5
PerObjectSettingsCountRole = Qt.UserRole + 6 PerObjectSettingsCountRole = Qt.ItemDataRole.UserRole + 6
MeshTypeRole = Qt.UserRole + 7 MeshTypeRole = Qt.ItemDataRole.UserRole + 7
ExtruderNumberRole = Qt.UserRole + 8 ExtruderNumberRole = Qt.ItemDataRole.UserRole + 8
def __init__(self, parent = None) -> None: def __init__(self, parent = None) -> None:
super().__init__(parent) super().__init__(parent)

10
cura/UI/WelcomePagesModel.py
View file

@ -36,11 +36,11 @@ class WelcomePagesModel(ListModel):
Note that in any case, a page that has its "should_show_function" == False will ALWAYS be skipped. Note that in any case, a page that has its "should_show_function" == False will ALWAYS be skipped.
""" """
IdRole = Qt.UserRole + 1 # Page ID IdRole = Qt.ItemDataRole.UserRole + 1 # Page ID
PageUrlRole = Qt.UserRole + 2 # URL to the page's QML file PageUrlRole = Qt.ItemDataRole.UserRole + 2 # URL to the page's QML file
NextPageIdRole = Qt.UserRole + 3 # The next page ID it should go to NextPageIdRole = Qt.ItemDataRole.UserRole + 3 # The next page ID it should go to
NextPageButtonTextRole = Qt.UserRole + 4 # The text for the next page button NextPageButtonTextRole = Qt.ItemDataRole.UserRole + 4 # The text for the next page button
PreviousPageButtonTextRole = Qt.UserRole + 5 # The text for the previous page button PreviousPageButtonTextRole = Qt.ItemDataRole.UserRole + 5 # The text for the previous page button
def __init__(self, application: "CuraApplication", parent: Optional["QObject"] = None) -> None: def __init__(self, application: "CuraApplication", parent: Optional["QObject"] = None) -> None:
super().__init__(parent) super().__init__(parent)

8
plugins/3MFReader/UpdatableMachinesModel.py
View file

@ -25,10 +25,10 @@ class UpdatableMachinesModel(ListModel):
def __init__(self, parent = None) -> None: def __init__(self, parent = None) -> None:
super().__init__(parent) super().__init__(parent)
self.addRoleName(Qt.UserRole + 1, "id") self.addRoleName(Qt.ItemDataRole.UserRole + 1, "id")
self.addRoleName(Qt.UserRole + 2, "name") self.addRoleName(Qt.ItemDataRole.UserRole + 2, "name")
self.addRoleName(Qt.UserRole + 3, "displayName") self.addRoleName(Qt.ItemDataRole.UserRole + 3, "displayName")
self.addRoleName(Qt.UserRole + 4, "type") # Either "default_option" or "machine" self.addRoleName(Qt.ItemDataRole.UserRole + 4, "type") # Either "default_option" or "machine"
def update(self, machines: List[GlobalStack]) -> None: def update(self, machines: List[GlobalStack]) -> None:
items = [create_new_list_item] # type: List[Dict[str, str]] items = [create_new_list_item] # type: List[Dict[str, str]]

14
plugins/DigitalLibrary/src/DigitalFactoryFileModel.py
View file

@ -13,13 +13,13 @@ DIGITAL_FACTORY_DISPLAY_DATETIME_FORMAT = "%d-%m-%Y %H:%M"
class DigitalFactoryFileModel(ListModel): class DigitalFactoryFileModel(ListModel):
FileNameRole = Qt.UserRole + 1 FileNameRole = Qt.ItemDataRole.UserRole + 1
FileIdRole = Qt.UserRole + 2 FileIdRole = Qt.ItemDataRole.UserRole + 2
FileSizeRole = Qt.UserRole + 3 FileSizeRole = Qt.ItemDataRole.UserRole + 3
LibraryProjectIdRole = Qt.UserRole + 4 LibraryProjectIdRole = Qt.ItemDataRole.UserRole + 4
DownloadUrlRole = Qt.UserRole + 5 DownloadUrlRole = Qt.ItemDataRole.UserRole + 5
UsernameRole = Qt.UserRole + 6 UsernameRole = Qt.ItemDataRole.UserRole + 6
UploadedAtRole = Qt.UserRole + 7 UploadedAtRole = Qt.ItemDataRole.UserRole + 7
dfFileModelChanged = pyqtSignal() dfFileModelChanged = pyqtSignal()

12
plugins/DigitalLibrary/src/DigitalFactoryProjectModel.py
View file

@ -12,12 +12,12 @@ PROJECT_UPDATED_AT_DATETIME_FORMAT = "%d-%m-%Y"
class DigitalFactoryProjectModel(ListModel): class DigitalFactoryProjectModel(ListModel):
DisplayNameRole = Qt.UserRole + 1 DisplayNameRole = Qt.ItemDataRole.UserRole + 1
LibraryProjectIdRole = Qt.UserRole + 2 LibraryProjectIdRole = Qt.ItemDataRole.UserRole + 2
DescriptionRole = Qt.UserRole + 3 DescriptionRole = Qt.ItemDataRole.UserRole + 3
ThumbnailUrlRole = Qt.UserRole + 5 ThumbnailUrlRole = Qt.ItemDataRole.UserRole + 5
UsernameRole = Qt.UserRole + 6 UsernameRole = Qt.ItemDataRole.UserRole + 6
LastUpdatedRole = Qt.UserRole + 7 LastUpdatedRole = Qt.ItemDataRole.UserRole + 7
dfProjectModelChanged = pyqtSignal() dfProjectModelChanged = pyqtSignal()

16
plugins/Toolbox/src/AuthorsModel.py
View file

@ -20,14 +20,14 @@ class AuthorsModel(ListModel):
self._metadata = None # type: Optional[List[Dict[str, Union[str, List[str], int]]]] self._metadata = None # type: Optional[List[Dict[str, Union[str, List[str], int]]]]
self.addRoleName(Qt.UserRole + 1, "id") self.addRoleName(Qt.ItemDataRole.UserRole + 1, "id")
self.addRoleName(Qt.UserRole + 2, "name") self.addRoleName(Qt.ItemDataRole.UserRole + 2, "name")
self.addRoleName(Qt.UserRole + 3, "email") self.addRoleName(Qt.ItemDataRole.UserRole + 3, "email")
self.addRoleName(Qt.UserRole + 4, "website") self.addRoleName(Qt.ItemDataRole.UserRole + 4, "website")
self.addRoleName(Qt.UserRole + 5, "package_count") self.addRoleName(Qt.ItemDataRole.UserRole + 5, "package_count")
self.addRoleName(Qt.UserRole + 6, "package_types") self.addRoleName(Qt.ItemDataRole.UserRole + 6, "package_types")
self.addRoleName(Qt.UserRole + 7, "icon_url") self.addRoleName(Qt.ItemDataRole.UserRole + 7, "icon_url")
self.addRoleName(Qt.UserRole + 8, "description") self.addRoleName(Qt.ItemDataRole.UserRole + 8, "description")
# List of filters for queries. The result is the union of the each list of results. # List of filters for queries. The result is the union of the each list of results.
self._filter = {} # type: Dict[str, str] self._filter = {} # type: Dict[str, str]

10
plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py
View file

@ -20,11 +20,11 @@ class SubscribedPackagesModel(ListModel):
self._discrepancies = None self._discrepancies = None
self._sdk_version = ApplicationMetadata.CuraSDKVersion self._sdk_version = ApplicationMetadata.CuraSDKVersion
self.addRoleName(Qt.UserRole + 1, "package_id") self.addRoleName(Qt.ItemDataRole.UserRole + 1, "package_id")
self.addRoleName(Qt.UserRole + 2, "display_name") self.addRoleName(Qt.ItemDataRole.UserRole + 2, "display_name")
self.addRoleName(Qt.UserRole + 3, "icon_url") self.addRoleName(Qt.ItemDataRole.UserRole + 3, "icon_url")
self.addRoleName(Qt.UserRole + 4, "is_compatible") self.addRoleName(Qt.ItemDataRole.UserRole + 4, "is_compatible")
self.addRoleName(Qt.UserRole + 5, "is_dismissed") self.addRoleName(Qt.ItemDataRole.UserRole + 5, "is_dismissed")
@pyqtProperty(bool, constant=True) @pyqtProperty(bool, constant=True)
def hasCompatiblePackages(self) -> bool: def hasCompatiblePackages(self) -> bool:

10
plugins/Toolbox/src/ConfigsModel.py
View file

@ -14,11 +14,11 @@ class ConfigsModel(ListModel):
self._configs = None self._configs = None
self.addRoleName(Qt.UserRole + 1, "machine") self.addRoleName(Qt.ItemDataRole.UserRole + 1, "machine")
self.addRoleName(Qt.UserRole + 2, "print_core") self.addRoleName(Qt.ItemDataRole.UserRole + 2, "print_core")
self.addRoleName(Qt.UserRole + 3, "build_plate") self.addRoleName(Qt.ItemDataRole.UserRole + 3, "build_plate")
self.addRoleName(Qt.UserRole + 4, "support_material") self.addRoleName(Qt.ItemDataRole.UserRole + 4, "support_material")
self.addRoleName(Qt.UserRole + 5, "quality") self.addRoleName(Qt.ItemDataRole.UserRole + 5, "quality")
def setConfigs(self, configs): def setConfigs(self, configs):
self._configs = configs self._configs = configs

44
plugins/Toolbox/src/PackagesModel.py
View file

@ -23,28 +23,28 @@ class PackagesModel(ListModel):
self._metadata = None self._metadata = None
self.addRoleName(Qt.UserRole + 1, "id") self.addRoleName(Qt.ItemDataRole.UserRole + 1, "id")
self.addRoleName(Qt.UserRole + 2, "type") self.addRoleName(Qt.ItemDataRole.UserRole + 2, "type")
self.addRoleName(Qt.UserRole + 3, "name") self.addRoleName(Qt.ItemDataRole.UserRole + 3, "name")
self.addRoleName(Qt.UserRole + 4, "version") self.addRoleName(Qt.ItemDataRole.UserRole + 4, "version")
self.addRoleName(Qt.UserRole + 5, "author_id") self.addRoleName(Qt.ItemDataRole.UserRole + 5, "author_id")
self.addRoleName(Qt.UserRole + 6, "author_name") self.addRoleName(Qt.ItemDataRole.UserRole + 6, "author_name")
self.addRoleName(Qt.UserRole + 7, "author_email") self.addRoleName(Qt.ItemDataRole.UserRole + 7, "author_email")
self.addRoleName(Qt.UserRole + 8, "description") self.addRoleName(Qt.ItemDataRole.UserRole + 8, "description")
self.addRoleName(Qt.UserRole + 9, "icon_url") self.addRoleName(Qt.ItemDataRole.UserRole + 9, "icon_url")
self.addRoleName(Qt.UserRole + 10, "image_urls") self.addRoleName(Qt.ItemDataRole.UserRole + 10, "image_urls")
self.addRoleName(Qt.UserRole + 11, "download_url") self.addRoleName(Qt.ItemDataRole.UserRole + 11, "download_url")
self.addRoleName(Qt.UserRole + 12, "last_updated") self.addRoleName(Qt.ItemDataRole.UserRole + 12, "last_updated")
self.addRoleName(Qt.UserRole + 13, "is_bundled") self.addRoleName(Qt.ItemDataRole.UserRole + 13, "is_bundled")
self.addRoleName(Qt.UserRole + 14, "is_active") self.addRoleName(Qt.ItemDataRole.UserRole + 14, "is_active")
self.addRoleName(Qt.UserRole + 15, "is_installed") # Scheduled pkgs are included in the model but should not be marked as actually installed self.addRoleName(Qt.ItemDataRole.UserRole + 15, "is_installed") # Scheduled pkgs are included in the model but should not be marked as actually installed
self.addRoleName(Qt.UserRole + 16, "has_configs") self.addRoleName(Qt.ItemDataRole.UserRole + 16, "has_configs")
self.addRoleName(Qt.UserRole + 17, "supported_configs") self.addRoleName(Qt.ItemDataRole.UserRole + 17, "supported_configs")
self.addRoleName(Qt.UserRole + 18, "download_count") self.addRoleName(Qt.ItemDataRole.UserRole + 18, "download_count")
self.addRoleName(Qt.UserRole + 19, "tags") self.addRoleName(Qt.ItemDataRole.UserRole + 19, "tags")
self.addRoleName(Qt.UserRole + 20, "links") self.addRoleName(Qt.ItemDataRole.UserRole + 20, "links")
self.addRoleName(Qt.UserRole + 21, "website") self.addRoleName(Qt.ItemDataRole.UserRole + 21, "website")
self.addRoleName(Qt.UserRole + 22, "login_required") self.addRoleName(Qt.ItemDataRole.UserRole + 22, "login_required")
# List of filters for queries. The result is the union of the each list of results. # List of filters for queries. The result is the union of the each list of results.
self._filter = {} # type: Dict[str, str] self._filter = {} # type: Dict[str, str]