GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 12:25:57 +08:00
Code Issues Packages Projects Releases Wiki Activity
26,599 Commits 295 Branches 268 Tags
Commit Graph

26599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
0069182c6b
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-12-03 13:25:10 +01:00
Ghostkeeper
5edd830210
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-12-03 13:25:10 +01:00
Ghostkeeper
d31079b7aa
Split page in header and contents 
This requires a small refactor here.

Contributes to issue CURA-8565.
 2021-12-03 13:25:09 +01:00
Ghostkeeper
cb7b9b3193
Increase size of icon to fit button exactly 
Contributes to issue CURA-8565.
 2021-12-03 13:25:09 +01:00
Ghostkeeper
d4ebf3baa0
Also use proper icon size for left icon 
Almost forgot!

Contributes to issue CURA-8565.
 2021-12-03 13:25:09 +01:00
Ghostkeeper
0cd8798aff
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-12-03 13:25:09 +01:00
Ghostkeeper
04501f788c
Allow changing the icon size 
But use the same default as what was previously hard-coded. Now we can have buttons with non-standard icon sizes then, e.g. if the button size itself is also non-standard.

Contributes to issue CURA-8565.
 2021-12-03 13:25:09 +01:00
Ghostkeeper
27d9118d17
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-12-03 13:25:09 +01:00
Ghostkeeper
26a39f0240
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-12-03 13:25:09 +01:00
Jaime van Kessel
34911380d2
Change fonts to default 
No idea why they were medium, but the design clearly shows that it should be the default font
 2021-12-03 13:25:09 +01:00
Jaime van Kessel
a59307e10d
Also set correct size for package card title 2021-12-03 13:25:09 +01:00
Jelle Spijker
3c225f1a73
Fixed some layout issues with the Package Cards 
Contributes to: CURA-8587
 2021-12-03 13:25:08 +01:00
Jelle Spijker
5373e9a36d
More generic way of showing the manage buttons 
Contributes to: CURA-8587
 2021-12-03 13:25:08 +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
64dba8374a
Remove fill colours 
The colour gets determined by the theme.

Contributes to issue CURA-8562.
 2021-11-22 17:17:24 +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
05c0857cb2
Add Certified icon 
Contributes to CURA-8562
 2021-11-19 11:21:30 +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
Jaime van Kessel
5c875a1394
Merge pull request #10812 from Ultimaker/CURA-8559_add_marketplace_search 
[CURA-8559] Add new-marketplace search
 2021-11-16 15:57:27 +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
87f94e680b
Use re-usable search-bar for Settings search as well. 
done as part of CURA-8559
 2021-11-16 10:20:08 +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