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

Merge branch 'marketplace_redesign' into CURA-8565_marketplace_plugin_details

Browse source 
Conflicts:
	plugins/Marketplace/resources/qml/Marketplace.qml -> Whole layout changed, while the onboarding banner got added. I re-added the onboarding banner item and the new search link at locations where I thought it was appropriate.
	plugins/Marketplace/resources/qml/Packages.qml -> A small conflict where new properties got added while I moved the width property up a bit for consistency. Easy enough to fix.
This commit is contained in:
Ghostkeeper 2021-11-30 16:16:20 +01:00
commit d6143103d0
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
8 changed files with 191 additions and 1 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