diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index c1d85a0101..04ca16219b 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -158,21 +158,23 @@ class CuraPackageManager(QObject): return installed_packages_dict def __convertPluginMetadataToPackageMetadata(self, plugin_metadata: dict) -> dict: - package_metadata = {"package_id": plugin_metadata["id"], - "package_type": "plugin", - "display_name": plugin_metadata["plugin"]["name"], - "description": plugin_metadata["plugin"].get("description"), - "package_version": plugin_metadata["plugin"]["version"], - "cura_version": int(plugin_metadata["plugin"]["api"]), - "website": "", - "author": { - "author_id": plugin_metadata["plugin"].get("author", ""), - "display_name": plugin_metadata["plugin"].get("author", ""), - "email": "", - "website": "", - }, - "tags": ["plugin"], - } + package_metadata = { + "package_id": plugin_metadata["id"], + "package_type": "plugin", + "display_name": plugin_metadata["plugin"]["name"], + "description": plugin_metadata["plugin"].get("description"), + "package_version": plugin_metadata["plugin"]["version"], + "cura_version": int(plugin_metadata["plugin"]["api"]), + "website": "", + "author_id": plugin_metadata["plugin"].get("author", "UnknownID"), + "author": { + "author_id": plugin_metadata["plugin"].get("author", "UnknownID"), + "display_name": plugin_metadata["plugin"].get("author", ""), + "email": "", + "website": "", + }, + "tags": ["plugin"], + } return package_metadata # Checks if the given package is installed. diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailList.qml b/plugins/Toolbox/resources/qml/ToolboxDetailList.qml index c49e3cb416..f58e484c69 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDetailList.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDetailList.qml @@ -23,7 +23,7 @@ Item bottomMargin: UM.Theme.getSize("wide_margin").height top: parent.top } - height: childrenRect.height + UM.Theme.getSize("wide_margin").height + height: childrenRect.height + 2 * UM.Theme.getSize("wide_margin").height spacing: UM.Theme.getSize("default_margin").height Repeater { diff --git a/plugins/Toolbox/src/PackagesModel.py b/plugins/Toolbox/src/PackagesModel.py index 2e8cc1a97f..34ea5b8d42 100644 --- a/plugins/Toolbox/src/PackagesModel.py +++ b/plugins/Toolbox/src/PackagesModel.py @@ -43,13 +43,14 @@ class PackagesModel(ListModel): items = [] for package in self._metadata: + print(package["author"]) items.append({ "id": package["package_id"], "type": package["package_type"], "name": package["display_name"], "version": package["package_version"], - "author_id": package["author"]["author_id"], - "author_name": package["author"]["display_name"], + "author_id": package["author"]["author_id"] if "author_id" in package["author"] else package["author"]["name"], + "author_name": package["author"]["display_name"] if "display_name" in package["author"] else package["author"]["name"], "author_email": package["author"]["email"] if "email" in package["author"] else "None", "description": package["description"], "icon_url": package["icon_url"] if "icon_url" in package else None,