mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-04 12:33:57 -06:00
Move UltimakerCloudAuthentication and UltimakerCloudScope
...to their own module Fixes an import error where UltimakerCloudScope was used my both the Toolbox and CuraDrive plugins CURA-7150
This commit is contained in:
parent
2e7b47f1ea
commit
96ed85f9c0
15 changed files with 53 additions and 80 deletions
|
@ -14,7 +14,7 @@ from UM.TaskManagement.HttpRequestManager import HttpRequestManager
|
|||
from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope
|
||||
from UM.i18n import i18nCatalog
|
||||
from cura.CuraApplication import CuraApplication
|
||||
from plugins.Toolbox.src.UltimakerCloudScope import UltimakerCloudScope
|
||||
from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope
|
||||
|
||||
catalog = i18nCatalog("cura")
|
||||
|
||||
|
|
|
@ -11,9 +11,9 @@ from UM.TaskManagement.HttpRequestManager import HttpRequestManager
|
|||
from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope
|
||||
from UM.i18n import i18nCatalog
|
||||
from cura.CuraApplication import CuraApplication
|
||||
from plugins.CuraDrive.src.RestoreBackupJob import RestoreBackupJob
|
||||
from plugins.Toolbox.src.UltimakerCloudScope import UltimakerCloudScope
|
||||
from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope
|
||||
from .CreateBackupJob import CreateBackupJob
|
||||
from .RestoreBackupJob import RestoreBackupJob
|
||||
from .Settings import Settings
|
||||
|
||||
catalog = i18nCatalog("cura")
|
||||
|
|
|
@ -40,7 +40,7 @@ class RestoreBackupJob(Job):
|
|||
assert url is not None
|
||||
|
||||
HttpRequestManager.getInstance().get(
|
||||
url =url,
|
||||
url = url,
|
||||
callback = self._onRestoreRequestCompleted,
|
||||
error_callback = self._onRestoreRequestCompleted
|
||||
)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Copyright (c) 2018 Ultimaker B.V.
|
||||
# Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
from cura import UltimakerCloudAuthentication
|
||||
from cura.UltimakerCloud import UltimakerCloudAuthentication
|
||||
|
||||
|
||||
class Settings:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue