diff --git a/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml b/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml index 1c58b46b96..f0066c2698 100644 --- a/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml +++ b/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml @@ -8,6 +8,7 @@ import UM 1.1 as UM Item { + property var packageData anchors.topMargin: UM.Theme.getSize("default_margin").height height: visible ? childrenRect.height : 0 visible: packageData.type == "material" && packageData.has_configs diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml index b2b41d30ea..dab90f8e06 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml @@ -10,7 +10,6 @@ Item { id: tile property bool installed: toolbox.isInstalled(model.id) - property var packageData: model width: detailList.width - UM.Theme.getSize("wide_margin").width height: Math.max(UM.Theme.getSize("toolbox_detail_tile").height, childrenRect.height + UM.Theme.getSize("default_margin").height) Item @@ -46,6 +45,7 @@ Item font: UM.Theme.getFont("default") } } + Item { id: controls @@ -164,6 +164,7 @@ Item id: compatibilityChart anchors.top: normalData.bottom width: normalData.width + packageData: model } Rectangle diff --git a/plugins/Toolbox/src/PackagesModel.py b/plugins/Toolbox/src/PackagesModel.py index 611d24af9d..d1905e1742 100644 --- a/plugins/Toolbox/src/PackagesModel.py +++ b/plugins/Toolbox/src/PackagesModel.py @@ -59,7 +59,7 @@ class PackagesModel(ListModel): "version": package["package_version"], "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", + "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, "image_urls": package["image_urls"] if "image_urls" in package else None,