3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

20
plugins/Marketplace/resources/qml/Marketplace.qml
View file

@ -86,6 +86,15 @@ Window
}
}
OnboardBanner
{
visible: content.item && content.item.bannerVisible
text: content.item && content.item.bannerText
icon: content.item && content.item.bannerIcon
onRemove: content.item && content.item.onRemoveBanner
readMoreUrl: content.item && content.item.bannerReadMoreUrl
}
// Search & Top-Level Tabs
Item
{
@ -167,6 +176,17 @@ Window
}
}
Cura.TertiaryButton
{
text: catalog.i18nc("@info", "Search in the browser")
iconSource: UM.Theme.getIcon("LinkExternal")
isIconOnRightSide: true
font: UM.Theme.getFont("default")
onClicked: content.item && Qt.openUrlExternally(content.item.searchInBrowserUrl)
}
// Page contents.
Rectangle
{