Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4

This commit is contained in:
Diego Prado Gesto 2018-06-05 11:00:54 +02:00
commit 4af107dc81
6 changed files with 337 additions and 7 deletions

View file

@ -133,7 +133,7 @@ class CuraPackageManager(QObject):
return None
def getAllInstalledPackagesInfo(self) -> dict:
def getAllInstalledPackageIDs(self) -> set:
# Add bundled, installed, and to-install packages to the set of installed package IDs
all_installed_ids = set()
@ -146,6 +146,12 @@ class CuraPackageManager(QObject):
if self._to_install_package_dict.keys():
all_installed_ids = all_installed_ids.union(set(self._to_install_package_dict.keys()))
return all_installed_ids
def getAllInstalledPackagesInfo(self) -> dict:
all_installed_ids = self.getAllInstalledPackageIDs()
# map of <package_type> -> <package_id> -> <package_info>
installed_packages_dict = {}
for package_id in all_installed_ids: