Merge branch 'CURA-7038_remove_labels_if_no_packages' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2020-01-09 13:25:39 +01:00
commit f15e0c5477
No known key found for this signature in database
GPG key ID: 3710727397403C91
3 changed files with 34 additions and 9 deletions

View file

@ -10,6 +10,7 @@ class SubscribedPackagesModel(ListModel):
def __init__(self, parent = None):
super().__init__(parent)
self._items = []
self._metadata = None
self._discrepancies = None
self._sdk_version = ApplicationMetadata.CuraSDKVersion
@ -27,20 +28,34 @@ class SubscribedPackagesModel(ListModel):
self._discrepancies = discrepancy
def update(self):
items = []
self._items.clear()
for item in self._metadata:
if item["package_id"] not in self._discrepancies:
continue
package = {"name": item["display_name"], "sdk_versions": item["sdk_versions"]}
if self._sdk_version not in item["sdk_versions"]:
package.update({"is_compatible": "False"})
package.update({"is_compatible": False})
else:
package.update({"is_compatible": "True"})
package.update({"is_compatible": True})
try:
package.update({"icon_url": item["icon_url"]})
except KeyError: # There is no 'icon_url" in the response payload for this package
package.update({"icon_url": ""})
items.append(package)
self.setItems(items)
self._items.append(package)
self.setItems(self._items)
def hasCompatiblePackages(self):
has_compatible_items = False
for item in self._items:
if item['is_compatible'] == True:
has_compatible_items = True
return has_compatible_items
def hasIncompatiblePackages(self):
has_incompatible_items = False
for item in self._items:
if item['is_compatible'] == False:
has_incompatible_items = True
return has_incompatible_items

View file

@ -796,6 +796,14 @@ class Toolbox(QObject, Extension):
def subscribedPackagesModel(self) -> SubscribedPackagesModel:
return cast(SubscribedPackagesModel, self._models["subscribed_packages"])
@pyqtProperty(bool, constant=True)
def has_compatible_packages(self) -> str:
return self._models["subscribed_packages"].hasCompatiblePackages()
@pyqtProperty(bool, constant=True)
def has_incompatible_packages(self) -> str:
return self._models["subscribed_packages"].hasIncompatiblePackages()
@pyqtProperty(QObject, constant = True)
def packagesModel(self) -> PackagesModel:
return cast(PackagesModel, self._models["packages"])