3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-28 21:31:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'origin/marketplace_redesign' into CURA-8587_disable_update_install_and_uninstall

Browse source 
# Conflicts:
#	plugins/Marketplace/LocalPackageList.py
#	plugins/Marketplace/PackageModel.py
#	plugins/Marketplace/RemotePackageList.py
#	plugins/Marketplace/resources/qml/Marketplace.qml
#	plugins/Marketplace/resources/qml/PackageCard.qml
#	plugins/Marketplace/resources/qml/Packages.qml
This commit is contained in:
Jelle Spijker 2021-12-03 13:36:56 +01:00
commit 4fef2de71c
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
4 changed files with 739 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/Marketplace/resources/qml/Packages.qml
View file

@ -13,6 +13,12 @@ ListView
property string pageTitle
property var selectedPackage
property string searchInBrowserUrl
property bool bannerVisible
property var bannerIcon
property string bannerText
property string bannerReadMoreUrl
property var onRemoveBanner
clip: true