mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-14 21:15:56 +08:00
Merge remote-tracking branch 'origin/CURA-7290_manual_account_sync' into CURA-7290_manual_account_sync
This commit is contained in:
commit
3ca703f00c
@ -1,7 +1,7 @@
|
|||||||
# 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 datetime import datetime
|
from datetime import datetime
|
||||||
from typing import Optional, Dict, TYPE_CHECKING
|
from typing import Optional, Dict, TYPE_CHECKING, Union
|
||||||
|
|
||||||
from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot, pyqtProperty, QTimer, Q_ENUMS
|
from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot, pyqtProperty, QTimer, Q_ENUMS
|
||||||
|
|
||||||
@ -87,7 +87,7 @@ class Account(QObject):
|
|||||||
self._update_timer.setSingleShot(True)
|
self._update_timer.setSingleShot(True)
|
||||||
self._update_timer.timeout.connect(self.syncRequested)
|
self._update_timer.timeout.connect(self.syncRequested)
|
||||||
|
|
||||||
self._sync_services = {} # type: Dict[str, SyncState]
|
self._sync_services = {} # type: Dict[str, int]
|
||||||
"""contains entries "service_name" : SyncState"""
|
"""contains entries "service_name" : SyncState"""
|
||||||
|
|
||||||
def initialize(self) -> None:
|
def initialize(self) -> None:
|
||||||
@ -97,7 +97,7 @@ class Account(QObject):
|
|||||||
self._authorization_service.accessTokenChanged.connect(self._onAccessTokenChanged)
|
self._authorization_service.accessTokenChanged.connect(self._onAccessTokenChanged)
|
||||||
self._authorization_service.loadAuthDataFromPreferences()
|
self._authorization_service.loadAuthDataFromPreferences()
|
||||||
|
|
||||||
def setSyncState(self, service_name: str, state: SyncState) -> None:
|
def setSyncState(self, service_name: str, state: int) -> None:
|
||||||
""" Can be used to register sync services and update account sync states
|
""" Can be used to register sync services and update account sync states
|
||||||
|
|
||||||
Contract: A sync service is expected exit syncing state in all cases, within reasonable time
|
Contract: A sync service is expected exit syncing state in all cases, within reasonable time
|
||||||
|
Loading…
x
Reference in New Issue
Block a user