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

Get rid of some errors first.

Browse source 
Was using Qt5 still, even though we're dumping that. Need a bit of a level playing field for an update to the way we handle libArcus and libSavitar.

part of CURA-7924
This commit is contained in:
Remco Burema 2022-02-25 13:25:35 +01:00
parent c7d7dd11d1
commit 99449dbc34
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/Marketplace/LocalPackageList.py
View file

@ -3,7 +3,7 @@
from typing import Any, Dict, List, Optional, TYPE_CHECKING from typing import Any, Dict, List, Optional, TYPE_CHECKING
from PyQt5.QtCore import pyqtSlot, QObject from PyQt6.QtCore import pyqtSlot, QObject
from UM.Version import Version from UM.Version import Version
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
@ -15,8 +15,8 @@ from .PackageModel import PackageModel
from .Constants import PACKAGE_UPDATES_URL from .Constants import PACKAGE_UPDATES_URL
if TYPE_CHECKING: if TYPE_CHECKING:
from PyQt5.QtCore import QObject from PyQt6.QtCore import QObject
from PyQt5.QtNetwork import QNetworkReply from PyQt6.QtNetwork import QNetworkReply
catalog = i18nCatalog("cura") catalog = i18nCatalog("cura")

2
plugins/Marketplace/Marketplace.py
View file

@ -2,7 +2,7 @@
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import os.path import os.path
from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject from PyQt6.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject
from typing import Optional, cast from typing import Optional, cast
from cura.CuraApplication import CuraApplication # Creating QML objects and managing packages. from cura.CuraApplication import CuraApplication # Creating QML objects and managing packages.

8
plugins/Marketplace/PackageList.py
View file

@ -4,7 +4,7 @@ import tempfile
import json import json
import os.path import os.path
from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, Qt from PyQt6.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, Qt
from typing import cast, Dict, Optional, Set, TYPE_CHECKING from typing import cast, Dict, Optional, Set, TYPE_CHECKING
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
@ -22,8 +22,8 @@ from .PackageModel import PackageModel
from .Constants import USER_PACKAGES_URL, PACKAGES_URL from .Constants import USER_PACKAGES_URL, PACKAGES_URL
if TYPE_CHECKING: if TYPE_CHECKING:
from PyQt5.QtCore import QObject from PyQt6.QtCore import QObject
from PyQt5.QtNetwork import QNetworkReply from PyQt6.QtNetwork import QNetworkReply
catalog = i18nCatalog("cura") catalog = i18nCatalog("cura")
@ -32,7 +32,7 @@ class PackageList(ListModel):
""" A List model for Packages, this class serves as parent class for more detailed implementations. """ A List model for Packages, this class serves as parent class for more detailed implementations.
such as Packages obtained from Remote or Local source such as Packages obtained from Remote or Local source
""" """
PackageRole = Qt.UserRole + 1 PackageRole = Qt.ItemDataRole.UserRole + 1
DISK_WRITE_BUFFER_SIZE = 256 * 1024 # 256 KB DISK_WRITE_BUFFER_SIZE = 256 * 1024 # 256 KB
def __init__(self, parent: Optional["QObject"] = None) -> None: def __init__(self, parent: Optional["QObject"] = None) -> None:

4
plugins/Marketplace/PackageModel.py
View file

@ -5,8 +5,8 @@ import re
from enum import Enum from enum import Enum
from typing import Any, cast, Dict, List, Optional from typing import Any, cast, Dict, List, Optional
from PyQt5.QtCore import pyqtProperty, QObject, pyqtSignal, pyqtSlot from PyQt6.QtCore import pyqtProperty, QObject, pyqtSignal, pyqtSlot
from PyQt5.QtQml import QQmlEngine from PyQt6.QtQml import QQmlEngine
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from cura.CuraPackageManager import CuraPackageManager from cura.CuraPackageManager import CuraPackageManager

6
plugins/Marketplace/RemotePackageList.py
View file

@ -1,8 +1,8 @@
# Copyright (c) 2021 Ultimaker B.V. # Copyright (c) 2021 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot from PyQt6.QtCore import pyqtProperty, pyqtSignal, pyqtSlot
from PyQt5.QtNetwork import QNetworkReply from PyQt6.QtNetwork import QNetworkReply
from typing import Optional, TYPE_CHECKING from typing import Optional, TYPE_CHECKING
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
@ -14,7 +14,7 @@ from .PackageList import PackageList
from .PackageModel import PackageModel # The contents of this list. from .PackageModel import PackageModel # The contents of this list.
if TYPE_CHECKING: if TYPE_CHECKING:
from PyQt5.QtCore import QObject from PyQt6.QtCore import QObject
catalog = i18nCatalog("cura") catalog = i18nCatalog("cura")