26650 Commits

Author SHA1 Message Date
Ghostkeeper
4ffca8da98
Implement getting the compatible printers of a package
Again, only really applicable to materials for now. But it's simple to keep this class generic.

Contributes to issue CURA-8585.
2021-11-30 17:29:28 +01:00
Ghostkeeper
b4020614d5
Add material links to package model
They will not be initialised for plug-ins.

Contributes to issue CURA-8585.
2021-11-30 17:17:50 +01:00
Ghostkeeper
d6143103d0
Merge branch 'marketplace_redesign' into CURA-8565_marketplace_plugin_details
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.
2021-11-30 16:16:20 +01:00
Ghostkeeper
cd09af885d
Fix resetting when Marketplace is closed and re-opened
Previously, this would cause the Marketplace to freeze. We're still not entirely sure why. It seems to be a bug in Qt, but it's rather hard to deal with.

This new solution is nicer in some ways but not as neat in others.
- We're no longer clearing the content of the loader, so the QML and the package data remains in memory while the Marketplace is closed. We deem this to not be a problem, because the memory usage of this package data is only a couple of kB, nothing compared to the memory used by the slicer when it loads a model.
- On the other hand, it's now possible to programmatically change the tab there, instead of manually having to click the buttons.
- Fixes a bug where the highlighted tab of of the tab bar doesn't update when closing and re-opening the Marketplace. And a bug where there was a search bar for the manage page while it didn't work.

Contributes to issue CURA-8565.
2021-11-30 15:59:30 +01:00
Ghostkeeper
02cf4ac440
Fix newline rendering in extended display
Rich Text is rendered a bit like HTML, where all of the whitespace gets changed into a single space. This is normally not so bad, but with newlines it's annoying. This preserves the newlines from the description.

Contributes to issue CURA-8565.
2021-11-30 15:01:39 +01:00
Ghostkeeper
c1f0fb1faf
Make icons smaller for tertiary buttons
These are typically visually smaller buttons, since they don't have an outline. It makes more sense to use the size of the text then, or something thereabouts.

Contributes to issue CURA-8565.
2021-11-30 14:56:09 +01:00
Ghostkeeper
c48c449354
Show hover colour when hovering a card
This signals to the user they can select one.

Contributes to issue CURA-8565.
2021-11-30 14:50:45 +01:00
Ghostkeeper
7529483cb0
Don't show download count for bundled plug-ins
I considered rewriting the section title property to be QML-only and translate it from the QML, but this is a bit simpler in the end, even though there is data duplication now.

Contributes to issue CURA-8565.
2021-11-30 14:42:12 +01:00
casper
a0dce47d54 Merge branch 'CURA-8564_Add_onboarding_banners_with_link_to_explain_Cura_MP' into marketplace_redesign 2021-11-30 14:27:41 +01:00
Jaime van Kessel
f1e337c9b2
Merge pull request #10964 from Ultimaker/CURA-8563_Easy_navigation_to_Cloud_marketplace
[Cura 8563] - Easy navigation to cloud marketplace
2021-11-30 14:25:10 +01:00
Jaime van Kessel
b0275cfba9 Add campaign links
CURA-8563
2021-11-30 14:17:40 +01:00
Ghostkeeper
7eca005659
Increase size of icons on action buttons
We want those to be 1.5em now. This has an effect on all action buttons with icons in the interface!

Contributes to issue CURA-8565.
2021-11-30 13:24:12 +01:00
casper
97ba4489ff Remove unneeded margin from search bar
Cura 8563
2021-11-30 13:01:45 +01:00
casper
c62b21ad44 Revert "Decrease margin sizes"
This reverts commit 49db5be3aa731f8c9be6fe39f77ccbb8ee26f622.
2021-11-30 12:57:22 +01:00
casper
d291ea85a2 Place the on boarding banners in the correct place in the marketplace
To comply with the UX design

CURA-8564
2021-11-30 12:20:21 +01:00
casper
5a148e459f Decrease size of the icons in the marketplace onboarding banners
CURA-8564
2021-11-30 12:19:32 +01:00
casper
8e6210fb2c Change margins of read more button in marketplace onboarding banner
To comply with UX design

CURA-8564
2021-11-30 12:11:32 +01:00
casper
ca60206728 Always show read more button in on boarding banner
Even if there is no link

CURA-8564
2021-11-30 12:10:55 +01:00
casper
82d148d077 Add correct text to material and plugins onboarding banners
CURA-8564
2021-11-30 12:08:09 +01:00
casper
49db5be3aa Decrease margin sizes
They were way bigger compared to the UX design

CURA-8563
2021-11-30 10:52:15 +01:00
casper
d96ba0dcf3 Easy navigation to Cloud marketplace
CURA-8563
2021-11-30 10:51:43 +01:00
Ghostkeeper
cac623b509
Use medium font size for extended description
The design appears more balanced then, quoth the designer of the layout.

Contributes to issue CURA-8565.
2021-11-30 10:49:49 +01:00
Remco Burema
55f9771dd4
Merge pull request #10948 from Ultimaker/CURA-8564_Add_onboarding_banners_with_link_to_explain_Cura_MP
Cura 8564 add onboarding banners with link to explain cura mp
2021-11-30 10:36:13 +01:00
Ghostkeeper
f385e3d639
Don't show elision or read more if there is no description at all
Apparently Qt marks it as 'truncated' then, even though it's not really. Don't show the ... nor the 'read more' button if there is nothing more to read.

Contributes to issue CURA-8565.
2021-11-29 19:59:43 +01:00
Ghostkeeper
d0eee2cffe
Make header of detail page depend on header of origin
It's the same as the list of packages you came from, now.

Contributes to issue CURA-8565.
2021-11-29 19:41:25 +01:00
Ghostkeeper
d96284ee3e
Only show formatted description in detail page
We can't show rich text in the package list, because the we use the onLineLaidOut signal there, which doesn't work with Rich Text. So for the package list we should NOT use the formatted version of the description because that will contain ugly HTML tags that the user wouldn't want to see. Show the original description there. Use the formatted description only in the detail page where we don't use onLineLaidOut.

Contributes to issue CURA-8565.
2021-11-29 19:35:57 +01:00
Ghostkeeper
b5c7dfe9a2
Format links in descriptions to be clickable
Took some fiddling to get the regex right. But it's nice now.

Contributes to issue CURA-8565.
2021-11-29 19:29:33 +01:00
Ghostkeeper
d511c4542a
Make package detail page scroll if details are too long
Some plug-ins could have very long descriptions now. We show all of it, but that could go off the screen in theory.

This makes the content scrollable if it goes off the screen.

Contributes to issue CURA-8565.
2021-11-29 19:04:30 +01:00
Ghostkeeper
ffd1a4d812
Add button to visit plug-in website
There are a lot of buttons leading to websites now: An arrow leading to the author website. An author name leading to the author website. A 'read more' label leading to the plug-in website and this new button leading to the plug-in website. Maybe we should raise this with the designer.

Contributes to issue CURA-8565.
2021-11-29 18:46:56 +01:00
Ghostkeeper
09b4bd2ac2
Add forgotten ArrowLeft icon
I've been using this for a while. It should've been included with the commit that added the button, but oh well.

Contributes to issue CURA-8565.
2021-11-29 18:37:54 +01:00
Ghostkeeper
e173fa2d9d
Add package description in full to detail card
I realise that this might cause the card to become taller than the window. Might need to do something about that.

Contributes to issue CURA-8565.
2021-11-29 18:33:58 +01:00
Ghostkeeper
0546f58e57
Add extended description header
Wrapping the whole content so far in another column so that we can have a wider part below, automatically aligned.

Contributes to issue CURA-8565.
2021-11-29 18:26:28 +01:00
Ghostkeeper
cfd29b268d
Use actual download count for packages
Quite easy. It turned out the model already had this information, due to foresight when the card itself got implemented.

Contributes to issue CURA-8565.
2021-11-29 18:05:53 +01:00
Ghostkeeper
0dcc28032a
Add download count design to detail card
Just the design. The data is just a placeholder so far.

Contributes to issue CURA-8565.
2021-11-29 18:03:42 +01:00
Ghostkeeper
443ba67455
Align ellipsis to text again
It used to be fine, but the font of the button got made different from the font of the description. It should be the same as the description, so this should remain correct even if the fonts change again.

Contributes to issue CURA-8565.
2021-11-29 17:49:11 +01:00
Ghostkeeper
d7058ef520
Change card summary information into a column
This is necessary because we can't anchor to the bottom of the card here, and because we want to swap out the description for a download count in the extended detail card.

Contributes to issue CURA-8565.
2021-11-29 17:40:53 +01:00
Ghostkeeper
8ecd2f86a4
Communicate to PackageCard whether it is a detailed card or not
If it is detailed, it currently hides the short description. That is not quite enough, but we'll expand that behaviour.

Contributes to issue CURA-8565.
2021-11-29 16:38:24 +01:00
Ghostkeeper
61fdd5dc72
Restore check for parent before getting its width
Delegates that are outside of the viewport may have no parent any more. Don't attempt to find their parents' width.

Contributes to issue CURA-8565.
2021-11-29 16:32:55 +01:00
Ghostkeeper
616bf479e5
Set position and width of card in details page
This means that the card itself shouldn't specify a width. It should get a width from how it's used.

Contributes to issue CURA-8565.
2021-11-29 16:11:15 +01:00
casper
6ca20ba863 Rename properties in marketplace onboarding banner
CURA-8564
2021-11-29 15:09:33 +01:00
Ghostkeeper
d5cfaa1e0a
Add package card to detail page
The card has the wrong layout, but it's a start. The data is communicated in any case.

Contributes to issue CURA-8565.
2021-11-29 14:50:48 +01:00
casper
c136deb430 Remove top anchor from an element used in ColumnLayout
This element did need additional margins at the top. Added margins
to the ColumnLayout element instead.

CURA-8564
2021-11-29 14:34:15 +01:00
Ghostkeeper
5dd2dcce90
Split page in header and contents
This requires a small refactor here.

Contributes to issue CURA-8565.
2021-11-29 12:57:36 +01:00
casper
b53c1ba306 Move static anchor properties inside the TertiaryButton element
CURA-8564
2021-11-29 12:34:25 +01:00
casper
6909085733 Use color from theme for the market place banner banner text
CURA-8564
2021-11-29 12:26:48 +01:00
casper
0ca20e9b3d Use an alias property for the banner icon
CURA-8564
2021-11-29 12:16:52 +01:00
Ghostkeeper
07ee729cde
Increase size of icon to fit button exactly
Contributes to issue CURA-8565.
2021-11-29 12:03:29 +01:00
Ghostkeeper
c117b61503
Also use proper icon size for left icon
Almost forgot!

Contributes to issue CURA-8565.
2021-11-29 12:03:03 +01:00
casper
f1a9bbd791 Use the Item element instead of Rectangle for banner icon
To prevent un-necessary draw checks as the background is transparent

CURA-8564
2021-11-29 12:01:42 +01:00
Ghostkeeper
6d1ffbde69
Remove superfluous anchors.fill
This is already set by the StackView, which (logically) requires that the children fill the entire space taken by the StackView.

Contributes to issue CURA-8565.
2021-11-29 11:59:46 +01:00