8360 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Ghostkeeper
07ee729cde
Increase size of icon to fit button exactly
Contributes to issue CURA-8565.
2021-11-29 12:03:29 +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
Ghostkeeper
0d05e71f9d
Basis of header line
I think the icon on the button is too small, but that's not currently configurable. Will have to look into that.

Contributes to issue CURA-8565.
2021-11-26 16:48:02 +01:00
Ghostkeeper
a715274ca7
Add a StackView around Marketplace to allow extra pages on top
This allows a sort of full-screen pop-up to replace the entire Marketplace window contents, on top of the normal contents. The normal contents are kept as they are, but out of view.

Contributes to issue CURA-8565.
2021-11-26 16:04:23 +01:00
Jaime van Kessel
09a569fdd1 Change fonts to default
No idea why they were medium, but the design clearly shows that it should be the default font
2021-11-26 14:39:26 +01:00
Jaime van Kessel
60b174177f Also set correct size for package card title 2021-11-26 14:39:02 +01:00
Remco Burema
b98e0d1753
Use author icon if no package icon known.
part of CURA-8562
2021-11-23 13:46:33 +01:00
Ghostkeeper
bddcf3cb0c
Add extensible switch case for tooltip
This way it's
- more clear what the two cases are
- and more robust if we ever add a third.

Contributes to issue CURA-8562.
2021-11-22 17:16:39 +01:00
Ghostkeeper
35ba8f78a0
Disambiguate associativity of and/or operators
It's the same, but it's a bit easier to read what it's doing. Placing the package type check first also helps to read what the two cases are here.

Contributes to issue CURA-8562.
2021-11-22 17:10:56 +01:00
Jelle Spijker
7fd9578599
Unified tooltip description
Contributes to CURA-8562
2021-11-19 11:21:29 +01:00
Jelle Spijker
eb3083c84d
use differentiate icon for Ultimaker controlled material/plugin
Materials can be certified, while plugins can be verified.
Added packageType to the model such that the card knows which icon
to use.

Contributes to CURA-8562
2021-11-19 11:21:29 +01:00
Jelle Spijker
584411e59e
Moved comments
if they're inline they mess up the QML syntax highlighter in PyCharm
2021-11-19 11:21:21 +01:00
Jelle Spijker
0fb78126d5
Merge pull request #10871 from Ultimaker/CURA-8559_mp_searchbar_fixes
[CURA-8559] (New-)Marketplace Search-Bar UX Fixes
2021-11-18 11:47:53 +01:00
Remco Burema
dcb9456848
Fix CApitalization and spurious space.
part of CURA-8561
2021-11-18 08:44:06 +01:00
Remco Burema
cd255b0ae5
Search Marketplace: Change message if no results found.
part of CURA-8559
2021-11-18 08:15:26 +01:00
Remco Burema
307d751c2d
Fix white rectangles in dark mode and height of search-bar.
part of CURA-8559
2021-11-18 08:14:04 +01:00
Jaime van Kessel
07e9237d72 Add missing action for button
CURA-8561
2021-11-17 14:23:26 +01:00
Jaime van Kessel
183fa06cfe Fix look of external link button
CURA-8561
2021-11-17 11:54:12 +01:00
Jaime van Kessel
f6b351f97f Fix size of footer
CURA-8561
2021-11-17 11:22:57 +01:00
Jaime van Kessel
5ac0df8b0f Fix styling of scrollbar in marketplace
CURA-8561
2021-11-17 11:22:30 +01:00
Jaime van Kessel
f01ce5b43c Fix direction of tooltip point
CURA-8561
2021-11-17 10:59:31 +01:00
Jaime van Kessel
d7e023c5ee Fix sizes of icons in package card
CURA-8561
2021-11-17 10:56:06 +01:00
Jaime van Kessel
5a08ae0eab Give the poor + a bit more breathing room
It's a pandemic, we need to give operators a bit of room ;)
2021-11-17 10:52:33 +01:00
Jaime van Kessel
71769ab168 Merge branch 'marketplace_navigation_improvements' of github.com:Ultimaker/Cura into marketplace_redesign 2021-11-17 10:51:49 +01:00
Jaime van Kessel
4ae01df7f5 Ensure that the packagecard looks like the design
CURA-8561
2021-11-17 10:27:48 +01:00
10r3n20
cc401e107e fixed conflicts 2021-11-17 10:07:42 +01:00
Jaime van Kessel
c8491b4752 Remove background color from external link button
CURA-8561
2021-11-17 09:15:08 +01:00
Jaime van Kessel
980cc22529 Simplify the layout of the packageCard
CURA-8561
2021-11-16 18:02:56 +01:00
Jaime van Kessel
e44a58b3a3 Use reusable simple button instead of redefining it 2021-11-16 16:51:09 +01:00