8331 Commits

Author SHA1 Message Date
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
Remco Burema
7c29e69f55
Small UX adjustments.
part of CURA-8561
2021-11-16 16:08:29 +01:00
10r3n20
fa307742b8 Merge branch 'marketplace_redesign' of github.com:ultimaker/cura into marketplace_navigation_improvements 2021-11-16 14:05:55 +01:00
10r3n20
4c6441f65e moved manage packages button inside the tabBar and adjusted styling 2021-11-16 14:02:07 +01:00
10r3n20
0e646a97f2 made font bold in tabs to be more aligned in weight with the gear icon 2021-11-16 11:40:24 +01:00
10r3n20
e4cd310303 added hover state to inactive tabs 2021-11-16 11:37:52 +01:00
10r3n20
74193ffff9 moved padding to PackageTybeTab and replaced default margin with narrow margin 2021-11-16 11:29:48 +01:00
Remco Burema
6df6dab6f0
Remove explicit transparent border on button.
done as part of CURA-8559
2021-11-16 10:38:00 +01:00
Remco Burema
24eaad4c6d
Make switching Marketplace-tabs work with search-bar.
Reset search-bar (text) when switching tabs. Also hide search-bar (at least for now) when dealing with the managed packages tab.

part of CURA-8559
2021-11-12 15:37:59 +01:00
Remco Burema
44242dcd02
Auto-load next batch with searched-for text in Marketplace.
part of CURA-8559
2021-11-12 15:20:46 +01:00
Remco Burema
79f7724923
Actually set search string + fix code style warnings.
It now works! Sort of. Turns out you have to manually click 'Load More' each time now :-) This is also at least partially explains the 'cases' mentioned in previous commit (when switching tabs).

part of CURA-8559
2021-11-12 14:30:09 +01:00
Remco Burema
d7ac307ace
Type in the search-bar and the remote package list reacts.
It doesn't do any actual searching yet though. Also switching between page doesn't work like it's supposed to yet (and probalby more of that sort of cases).

part of CURA-8559
2021-11-12 14:01:05 +01:00
Remco Burema
bc0b7301e5
Merge remote-tracking branch 'origin/marketplace_redesign' into CURA-8559_add_marketplace_search 2021-11-12 13:10:20 +01:00
Jelle Spijker
29c1909b41
Merge pull request #10748 from Ultimaker/CURA-8561_introduce_plugin_card
[CURA-8561] Introduce Plugin Card
2021-11-12 12:56:18 +01:00
Remco Burema
7432c0d8f0
Add (not yet operational) search-bar to new Marketplace.
part of CURA-8559
2021-11-12 12:11:45 +01:00
Remco Burema
b5d58f78d7
Fix: Actually make SearchBar-component independant.
It still depended on the Digital Library 'parent'.

part of CURA-8559
2021-11-12 11:49:37 +01:00
Remco Burema
977a12c989
Steal search-bar from DigitalFactory.
Make 'SearchBar' into a reusable component, so it can be used in the (new) Marketplace search. Also now at least the word 'Search' can be translated ;-)

part of CURA-8559
2021-11-12 09:52:24 +01:00
Remco Burema
d47b2fb5dd
Control should be (in)visible, not (just) image.
part oc CURA-8561
2021-11-12 08:52:48 +01:00
Remco Burema
4a7a74cba6
Also make description area foldable.
part of CURA-8561
2021-11-12 08:45:09 +01:00
Remco Burema
82f140aa39
Folded versus unfolded.
Hide disable/uninstall/install buttons, they're not active anyway and it's not part of this ticket in what state they should be hidden or not. What is part of the folded versus header is the download count row. (Also adapt link color.)

part of CURA-8561
2021-11-11 18:07:21 +01:00
Remco Burema
c1f2da8820
Layout fixes.
Prevent 'height' based binding loops.

part of CURA-8561
2021-11-11 17:30:43 +01:00
Remco Burema
51de234082
Links, hovers, ensmallify layout.
part of CURA-8561
2021-11-10 18:09:36 +01:00
10r3n20
887ac4aef8 Merge branch 'CURA-8561_introduce_plugin_card' of github.com:ultimaker/cura into marketplace_redesign 2021-11-10 09:56:22 +01:00
Ghostkeeper
1efdd9205b
Use primary colour for verified icon
Contributes to issue CURA-8561.
2021-11-09 17:47:32 +01:00
Ghostkeeper
d186912596
Correcter font sizes according to design
Contributes to issue CURA-8561.
2021-11-09 17:45:44 +01:00
Ghostkeeper
d526e3be8c
Easier layout shifting when icons are invisible
The Row element automatically hides them and removes any spacing if they are invisible.

Contributes to issue CURA-8561.
2021-11-09 17:40:10 +01:00
Ghostkeeper
f498952830
Give text colours to text
This way it's still visible in the dark theme, rather than black on black.

Contributes to issue CURA-8561.
2021-11-09 17:32:22 +01:00
Ghostkeeper
4119cf4209
Fix layout of author button
Bold, correct position and add the icon.

Contributes to issue CURA-8561.
2021-11-09 17:30:52 +01:00
Ghostkeeper
234475547e
Use correct font for all text elements
Contributes to issue CURA-8561.
2021-11-09 17:25:02 +01:00
Ghostkeeper
c56240f276
Use correct icon for external links
Contributes to issue CURA-8561.
2021-11-09 17:22:01 +01:00