GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 13:49:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use display_name for the package name in the license dialog

Browse Source 
Implemented for both CloudSync and Toolbox
This commit is contained in:
Nino van Hooff 2020-01-24 10:36:36 +01:00
parent 95def2850d
commit a02e8d3b58
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/Toolbox/src/CloudSync/LicensePresenter.py
View File

@ -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:

2
plugins/Toolbox/src/Toolbox.py
View File

@ -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)