3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

CuraPackageManager handles packages and plugins

Browse source 
CURA-4644
This commit is contained in:
Lipu Fei 2018-04-11 15:17:23 +02:00
parent 87c194178d
commit 596e0be7b6
5 changed files with 317 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cura/CuraApplication.py
View file

@ -140,7 +140,6 @@ class CuraApplication(QtApplication):
ExtruderStack = Resources.UserType + 9
DefinitionChangesContainer = Resources.UserType + 10
SettingVisibilityPreset = Resources.UserType + 11
CuraPackages = Resources.UserType + 12
Q_ENUMS(ResourceTypes)
@ -190,7 +189,6 @@ class CuraApplication(QtApplication):
Resources.addStorageType(self.ResourceTypes.MachineStack, "machine_instances")
Resources.addStorageType(self.ResourceTypes.DefinitionChangesContainer, "definition_changes")
Resources.addStorageType(self.ResourceTypes.SettingVisibilityPreset, "setting_visibility")
Resources.addStorageType(self.ResourceTypes.CuraPackages, "cura_packages")
ContainerRegistry.getInstance().addResourceType(self.ResourceTypes.QualityInstanceContainer, "quality")
ContainerRegistry.getInstance().addResourceType(self.ResourceTypes.QualityChangesInstanceContainer, "quality_changes")
@ -233,7 +231,6 @@ class CuraApplication(QtApplication):
self._simple_mode_settings_manager = None
self._cura_scene_controller = None
self._machine_error_checker = None
self._cura_package_manager = None
self._additional_components = {} # Components to add to certain areas in the interface
@ -244,6 +241,13 @@ class CuraApplication(QtApplication):
tray_icon_name = "cura-icon-32.png",
**kwargs)
# Initialize the package manager to remove and install scheduled packages.
from cura.CuraPackageManager import CuraPackageManager
self._cura_package_manager = CuraPackageManager(self)
self._cura_package_manager.initialize()
self.initialize()
# FOR TESTING ONLY
if kwargs["parsed_command_line"].get("trigger_early_crash", False):
assert not "This crash is triggered by the trigger_early_crash command line argument."
@ -655,10 +659,6 @@ class CuraApplication(QtApplication):
container_registry = ContainerRegistry.getInstance()
from cura.CuraPackageManager import CuraPackageManager
self._cura_package_manager = CuraPackageManager(self)
self._cura_package_manager.initialize()
Logger.log("i", "Initializing variant manager")
self._variant_manager = VariantManager(container_registry)
self._variant_manager.initialize()