Add icon to licenseDialog (clowd flow)

CURA-7129

plugins/Toolbox/src/CloudSync/DownloadPresenter.py

@@ -62,7 +62,8 @@ class DownloadPresenter:
                 "received": 0,
                 "total": 1,  # make sure this is not considered done yet. Also divByZero-safe
                 "file_written": None,
-                "request_data": request_data
+                "request_data": request_data,
+                "package_model": item
             }
 
         self._started = True
@@ -128,7 +129,14 @@ class DownloadPresenter:
             if not item["file_written"]:
                 return False
 
-        success_items = {package_id : value["file_written"] for package_id, value in self._progress.items()}
+        success_items = {
+            package_id:
+                {
+                    "package_path": value["file_written"],
+                    "icon_url": value["package_model"]["icon_url"]
+                }
+            for package_id, value in self._progress.items()
+        }
         error_items = [package_id for package_id in self._error]
 
         self._progress_message.hide()

plugins/Toolbox/src/CloudSync/LicenseModel.py

@@ -7,8 +7,9 @@ catalog = i18nCatalog("cura")
 # Model for the ToolboxLicenseDialog
 class LicenseModel(QObject):
     dialogTitleChanged = pyqtSignal()
-    headerChanged = pyqtSignal()
+    packageNameChanged = pyqtSignal()
     licenseTextChanged = pyqtSignal()
+    iconChanged = pyqtSignal()
 
     def __init__(self) -> None:
         super().__init__()
@@ -16,21 +17,29 @@ class LicenseModel(QObject):
         self._current_page_idx = 0
         self._page_count = 1
         self._dialogTitle = ""
-        self._header_text = ""
         self._license_text = ""
         self._package_name = ""
+        self._icon_url = ""
 
     @pyqtProperty(str, notify=dialogTitleChanged)
     def dialogTitle(self) -> str:
         return self._dialogTitle
 
-    @pyqtProperty(str, notify=headerChanged)
-    def headerText(self) -> str:
-        return self._header_text
+    @pyqtProperty(str, notify=packageNameChanged)
+    def packageName(self) -> str:
+        return self._package_name
 
     def setPackageName(self, name: str) -> None:
-        self._header_text = name + ": " + catalog.i18nc("@label", "This plugin contains a license.\nYou need to accept this license to install this plugin.\nDo you agree with the terms below?")
-        self.headerChanged.emit()
+        self._package_name = name
+        self.packageNameChanged.emit()
+
+    @pyqtProperty(str, notify=iconChanged)
+    def iconUrl(self) -> str:
+        return self._icon_url
+
+    def setIconUrl(self, url: str):
+        self._icon_url = url
+        self.iconChanged.emit()
 
     @pyqtProperty(str, notify=licenseTextChanged)
     def licenseText(self) -> str:

plugins/Toolbox/src/CloudSync/LicensePresenter.py

@@ -34,7 +34,7 @@ class LicensePresenter(QObject):
     ## Show a license dialog for multiple packages where users can read a license and accept or decline them
     # \param plugin_path: Root directory of the Toolbox plugin
     # \param packages: Dict[package id, file path]
-    def present(self, plugin_path: str, packages: Dict[str, str]) -> None:
+    def present(self, plugin_path: str, packages: Dict[str, Dict[str, str]]) -> None:
         path = os.path.join(plugin_path, self._compatibility_dialog_path)
 
         self._initState(packages)
@@ -60,14 +60,15 @@ class LicensePresenter(QObject):
         self._package_models[self._current_package_idx]["accepted"] = False
         self._checkNextPage()
 
-    def _initState(self, packages: Dict[str, str]) -> None:
+    def _initState(self, packages: Dict[str, Dict[str, str]]) -> None:
         self._package_models = [
                 {
                     "package_id" : package_id,
-                    "package_path" : package_path,
+                    "package_path" : item["package_path"],
+                    "icon_url" : item["icon_url"],
                     "accepted" : None  #: None: no answer yet
                 }
-                for package_id, package_path in packages.items()
+                for package_id, item in packages.items()
         ]
 
     def _presentCurrentPackage(self) -> None:
@@ -80,6 +81,7 @@ class LicensePresenter(QObject):
 
         self._license_model.setCurrentPageIdx(self._current_package_idx)
         self._license_model.setPackageName(package_model["package_id"])
+        self._license_model.setIconUrl(package_model["icon_url"])
         self._license_model.setLicenseText(license_content)
         if self._dialog:
             self._dialog.open()  # Does nothing if already open

plugins/Toolbox/src/CloudSync/SyncOrchestrator.py

@@ -63,9 +63,9 @@ class SyncOrchestrator(Extension):
         self._download_presenter.download(mutations)
 
     ## Called when a set of packages have finished downloading
-    # \param success_items: Dict[package_id, file_path]
+    # \param success_items: Dict[package_id, Dict[str, str]]
     # \param error_items: List[package_id]
-    def _onDownloadFinished(self, success_items: Dict[str, str], error_items: List[str]) -> None:
+    def _onDownloadFinished(self, success_items: Dict[str, Dict[str, str]], error_items: List[str]) -> None:
         if error_items:
             message = i18n_catalog.i18nc("@info:generic", "{} plugins failed to download".format(len(error_items)))
             self._showErrorMessage(message)