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

Fix Toolbox import error (continued)

Browse source 
(and remove unused import)

CURA-6983
This commit is contained in:
Nino van Hooff 2020-01-16 14:39:10 +01:00
parent 52d2fa47e9
commit 6763bed95f
11 changed files with 23 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/Toolbox/__init__.py
View file

@ -2,7 +2,6 @@
# Toolbox is released under the terms of the LGPLv3 or higher. # Toolbox is released under the terms of the LGPLv3 or higher.
from .src import Toolbox from .src import Toolbox
from plugins.Toolbox.src.CloudSync.CloudPackageChecker import CloudPackageChecker
from .src.CloudSync.SyncOrchestrator import SyncOrchestrator from .src.CloudSync.SyncOrchestrator import SyncOrchestrator

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

@ -4,7 +4,7 @@
import re import re
from typing import Dict, List, Optional, Union from typing import Dict, List, Optional, Union
from PyQt5.QtCore import Qt, pyqtProperty, pyqtSignal from PyQt5.QtCore import Qt, pyqtProperty
from UM.Qt.ListModel import ListModel from UM.Qt.ListModel import ListModel

6
plugins/Toolbox/src/CloudSync/CloudPackageChecker.py
View file

@ -8,10 +8,10 @@ from UM import i18nCatalog
from UM.Logger import Logger from UM.Logger import Logger
from UM.Message import Message from UM.Message import Message
from UM.Signal import Signal from UM.Signal import Signal
from plugins.Toolbox.src.UltimakerCloudScope import UltimakerCloudScope
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from plugins.Toolbox.src.CloudApiModel import CloudApiModel from ..CloudApiModel import CloudApiModel
from plugins.Toolbox.src.CloudSync.SubscribedPackagesModel import SubscribedPackagesModel from .SubscribedPackagesModel import SubscribedPackagesModel
from ..UltimakerCloudScope import UltimakerCloudScope
class CloudPackageChecker(QObject): class CloudPackageChecker(QObject):

4
plugins/Toolbox/src/CloudSync/CloudPackageManager.py
View file

@ -1,6 +1,6 @@
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from plugins.Toolbox.src.CloudApiModel import CloudApiModel from ..CloudApiModel import CloudApiModel
from plugins.Toolbox.src.UltimakerCloudScope import UltimakerCloudScope from ..UltimakerCloudScope import UltimakerCloudScope
## Manages Cloud subscriptions. When a package is added to a user's account, the user is 'subscribed' to that package ## Manages Cloud subscriptions. When a package is added to a user's account, the user is 'subscribed' to that package

4
plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py
View file

@ -1,11 +1,11 @@
import os import os
from typing import Optional, Dict from typing import Optional
from PyQt5.QtCore import QObject, pyqtSlot from PyQt5.QtCore import QObject, pyqtSlot
from UM.Qt.QtApplication import QtApplication from UM.Qt.QtApplication import QtApplication
from UM.Signal import Signal from UM.Signal import Signal
from plugins.Toolbox.src.CloudSync.SubscribedPackagesModel import SubscribedPackagesModel from .SubscribedPackagesModel import SubscribedPackagesModel
## Shows a list of packages to be added or removed. The user can select which packages to (un)install. The user's ## Shows a list of packages to be added or removed. The user can select which packages to (un)install. The user's

8
plugins/Toolbox/src/CloudSync/DownloadPresenter.py
View file

@ -1,7 +1,5 @@
import os
import tempfile import tempfile
from functools import reduce from typing import Dict, List, Any
from typing import Dict, List, Optional, Any
from PyQt5.QtNetwork import QNetworkReply from PyQt5.QtNetwork import QNetworkReply
@ -11,8 +9,8 @@ from UM.Message import Message
from UM.Signal import Signal from UM.Signal import Signal
from UM.TaskManagement.HttpRequestManager import HttpRequestManager from UM.TaskManagement.HttpRequestManager import HttpRequestManager
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from plugins.Toolbox.src.UltimakerCloudScope import UltimakerCloudScope from .SubscribedPackagesModel import SubscribedPackagesModel
from plugins.Toolbox.src.CloudSync.SubscribedPackagesModel import SubscribedPackagesModel from ..UltimakerCloudScope import UltimakerCloudScope
## Downloads a set of packages from the Ultimaker Cloud Marketplace ## Downloads a set of packages from the Ultimaker Cloud Marketplace

2
plugins/Toolbox/src/CloudSync/LicensePresenter.py
View file

@ -8,7 +8,7 @@ from UM.Signal import Signal
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
from plugins.Toolbox.src.CloudSync.LicenseModel import LicenseModel from .LicenseModel import LicenseModel
## Call present() to show a licenseDialog for a set of packages ## Call present() to show a licenseDialog for a set of packages

14
plugins/Toolbox/src/CloudSync/RestartApplicationPresenter.py
View file

@ -1,18 +1,6 @@
import os from UM import i18nCatalog
import tempfile
from functools import reduce
from typing import Dict, List, Optional, Any
from PyQt5.QtNetwork import QNetworkReply
from UM import i18n_catalog, i18nCatalog
from UM.Logger import Logger
from UM.Message import Message from UM.Message import Message
from UM.Signal import Signal
from UM.TaskManagement.HttpRequestManager import HttpRequestManager
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from plugins.Toolbox.src.UltimakerCloudScope import UltimakerCloudScope
from plugins.Toolbox.src.CloudSync.SubscribedPackagesModel import SubscribedPackagesModel
## Presents a dialog telling the user that a restart is required to apply changes ## Presents a dialog telling the user that a restart is required to apply changes

15
plugins/Toolbox/src/CloudSync/SyncOrchestrator.py
View file

@ -3,16 +3,15 @@ from typing import List, Dict, Any
from UM.Extension import Extension from UM.Extension import Extension
from UM.Logger import Logger from UM.Logger import Logger
from UM.PackageManager import PackageManager
from UM.PluginRegistry import PluginRegistry from UM.PluginRegistry import PluginRegistry
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from plugins.Toolbox.src.CloudSync.CloudPackageChecker import CloudPackageChecker from .CloudPackageChecker import CloudPackageChecker
from plugins.Toolbox.src.CloudSync.CloudPackageManager import CloudPackageManager from .CloudPackageManager import CloudPackageManager
from plugins.Toolbox.src.CloudSync.DiscrepanciesPresenter import DiscrepanciesPresenter from .DiscrepanciesPresenter import DiscrepanciesPresenter
from plugins.Toolbox.src.CloudSync.DownloadPresenter import DownloadPresenter from .DownloadPresenter import DownloadPresenter
from plugins.Toolbox.src.CloudSync.LicensePresenter import LicensePresenter from .LicensePresenter import LicensePresenter
from plugins.Toolbox.src.CloudSync.RestartApplicationPresenter import RestartApplicationPresenter from .RestartApplicationPresenter import RestartApplicationPresenter
from plugins.Toolbox.src.CloudSync.SubscribedPackagesModel import SubscribedPackagesModel from .SubscribedPackagesModel import SubscribedPackagesModel
## Orchestrates the synchronizing of packages from the user account to the installed packages ## Orchestrates the synchronizing of packages from the user account to the installed packages

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

@ -1,7 +1,8 @@
# Copyright (c) 2018 Ultimaker B.V. # Copyright (c) 2018 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 Qt, pyqtProperty from PyQt5.QtCore import Qt
from UM.Qt.ListModel import ListModel from UM.Qt.ListModel import ListModel

3
plugins/Toolbox/src/Toolbox.py
View file

@ -4,7 +4,6 @@
import json import json
import os import os
import tempfile import tempfile
import platform
from typing import cast, Any, Dict, List, Set, TYPE_CHECKING, Tuple, Optional, Union from typing import cast, Any, Dict, List, Set, TYPE_CHECKING, Tuple, Optional, Union
from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot
@ -19,8 +18,8 @@ from UM.Version import Version
from cura import ApplicationMetadata from cura import ApplicationMetadata
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from cura.Machines.ContainerTree import ContainerTree from cura.Machines.ContainerTree import ContainerTree
from .CloudApiModel import CloudApiModel
from .CloudApiModel import CloudApiModel
from .AuthorsModel import AuthorsModel from .AuthorsModel import AuthorsModel
from .CloudSync.LicenseModel import LicenseModel from .CloudSync.LicenseModel import LicenseModel
from .PackagesModel import PackagesModel from .PackagesModel import PackagesModel