From a02e8d3b587da570f8bcc805924f32ae250c7e7e Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 24 Jan 2020 10:36:36 +0100 Subject: [PATCH] Use display_name for the package name in the license dialog Implemented for both CloudSync and Toolbox --- plugins/Toolbox/src/CloudSync/LicensePresenter.py | 3 ++- plugins/Toolbox/src/Toolbox.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/Toolbox/src/CloudSync/LicensePresenter.py b/plugins/Toolbox/src/CloudSync/LicensePresenter.py index 0982bb4162..74fc2a3099 100644 --- a/plugins/Toolbox/src/CloudSync/LicensePresenter.py +++ b/plugins/Toolbox/src/CloudSync/LicensePresenter.py @@ -75,6 +75,7 @@ class LicensePresenter(QObject): def _presentCurrentPackage(self) -> None: package_model = self._package_models[self._current_package_idx] + package_info = self._package_manager.getPackageInfo(package_model["package_path"]) license_content = self._package_manager.getPackageLicense(package_model["package_path"]) if license_content is None: # Implicitly accept when there is no license @@ -82,7 +83,7 @@ class LicensePresenter(QObject): return self._license_model.setCurrentPageIdx(self._current_package_idx) - self._license_model.setPackageName(package_model["package_id"]) + self._license_model.setPackageName(package_info["display_name"]) self._license_model.setIconUrl(package_model["icon_url"]) self._license_model.setLicenseText(license_content) if self._dialog: diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 4835651b99..72e1f59615 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -675,7 +675,7 @@ class Toolbox(QObject, Extension): if license_content is not None: # get the icon url for package_id, make sure the result is a string, never None icon_url = next((x["icon_url"] for x in self.packagesModel.items if x["id"] == package_id), None) or "" - self.openLicenseDialog(package_id, license_content, file_path, icon_url) + self.openLicenseDialog(package_info["display_name"], license_content, file_path, icon_url) return installed_id = self.install(file_path)