Commit graph

31424 commits

Author SHA1 Message Date
Jaime van Kessel
f999d990e0 Fix error message after a failed sync.
This fxes the issue where it would still show an error message if you
first have a sync fail and then have one that succeeds

CURA-8670
2021-12-03 14:19:59 +01:00
Ghostkeeper
f0dc7a0eea
Adjust message to include suggestion to update firmware
Because the issue could also be that their firmware is outdated and doesn't yet support syncing material.

Contributes to issue CURA-8671.
2021-12-03 13:59:01 +01:00
Jelle Spijker
e37f08790f
Fixed a merge conflict
And not in a neat way. I'm a shamed to say copy-paste was used extensively.

Contributes to: CURA-8587
2021-12-03 13:51:43 +01:00
Jelle Spijker
4fef2de71c
Merge remote-tracking branch 'origin/marketplace_redesign' into CURA-8587_disable_update_install_and_uninstall
# Conflicts:
#	plugins/Marketplace/LocalPackageList.py
#	plugins/Marketplace/PackageModel.py
#	plugins/Marketplace/RemotePackageList.py
#	plugins/Marketplace/resources/qml/Marketplace.qml
#	plugins/Marketplace/resources/qml/PackageCard.qml
#	plugins/Marketplace/resources/qml/Packages.qml
2021-12-03 13:36:56 +01:00
Ghostkeeper
770adb2c02
Don't store None as capabilities, but empty list
This makes a few things easier. You could see None as being a signalling value to indicate that we don't know capabilities, but this signalling would get lost anyway in the serialising to the metadata. So just an empty list is fine for now.

Contributes to issue CURA-8671.
2021-12-03 13:36:06 +01:00
Jaime van Kessel
1671139225 Add some extra plugins to gitignore 2021-12-03 13:33:40 +01:00
Jelle Spijker
00acfe9d72
Added uninstall functionality
Get it in a sharable state

Contributes to: CURA-8587
2021-12-03 13:27:30 +01:00
Jelle Spijker
3b3d986058
Groundwork for installing/updating packages
Contributes to: CURA-8587
2021-12-03 13:27:26 +01:00
Jelle Spijker
08067432c6
disable other manageButtons when actions is performed
Still need to make this transfer to the detaile card

Contributes to: CURA-8587
2021-12-03 13:27:21 +01:00
Jelle Spijker
ff5a4a4f5a
Adding functionality to the manageButtons
Contributes to: CURA-8587
2021-12-03 13:27:16 +01:00
Jelle Spijker
327b434788
fix merge conflict
Contributes to: CURA-8587
2021-12-03 13:27:10 +01:00
Remco Burema
c1cffa09fe
Solve layout warnings. 2021-12-03 13:27:05 +01:00
Ghostkeeper
df66bcb541
Add additional buttons at the bottom for materials with links to data sheets
And where to buy it.

Contributes to issue CURA-8585.
2021-12-03 13:26:59 +01:00
Ghostkeeper
6f8a4e93e7
Fix name of capability to filter on
Contributes to issue CURA-8671.
2021-12-03 13:26:51 +01:00
casper
52c8e6b217
Decrease size of the icons in the marketplace onboarding banners
CURA-8564
2021-12-03 13:26:48 +01:00
casper
b07b5d5bc4
Change margins of read more button in marketplace onboarding banner
To comply with UX design

CURA-8564
2021-12-03 13:26:48 +01:00
casper
2618ad4a0f
Always show read more button in on boarding banner
Even if there is no link

CURA-8564
2021-12-03 13:26:48 +01:00
casper
e83f8e4b8a
Add correct text to material and plugins onboarding banners
CURA-8564
2021-12-03 13:26:48 +01:00
Jaime van Kessel
628be10e98
Add campaign links
CURA-8563
2021-12-03 13:26:48 +01:00
casper
61275ed9bc
Easy navigation to Cloud marketplace
CURA-8563
2021-12-03 13:26:41 +01:00
casper
fe19587b7f
Rename properties in marketplace onboarding banner
CURA-8564
2021-12-03 13:26:36 +01:00
casper
f10eea4fc4
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-12-03 13:26:31 +01:00
Ghostkeeper
6d9142579a
Add debuging repr to print more nicely
Otherwise you just see <CloudClusterResponse object> when you try to print this.

Contributes to issue CURA-8671.
2021-12-03 13:26:29 +01:00
casper
8d8de1c6f4
Move static anchor properties inside the TertiaryButton element
CURA-8564
2021-12-03 13:26:29 +01:00
casper
ad1798ee6e
Use color from theme for the market place banner banner text
CURA-8564
2021-12-03 13:26:29 +01:00
casper
67fc514b8f
Use an alias property for the banner icon
CURA-8564
2021-12-03 13:26:27 +01:00
casper
7e48657872
Use the Item element instead of Rectangle for banner icon
To prevent un-necessary draw checks as the background is transparent

CURA-8564
2021-12-03 13:26:25 +01:00
casper
5dc664e821
Use visible property of Rectangle
rather than defining a separate property

CURA-8564
2021-12-03 13:26:22 +01:00
casper
f7720d2a0d
Rename property bannerBody to bannerText
CURA-8564
2021-12-03 13:26:19 +01:00
casper
7e1247b171
Directly use bindings in banner pages
CURA-8564
2021-12-03 13:26:16 +01:00
casper
815aadb0d7
Add links to read me support pages
Note that since the support pages are not yet ready the "read more"
buttons are hidden. Once the correct link is added they become visible
again.
2021-12-03 13:26:14 +01:00
casper
a4d9beb9c2
Change font size in banner 2021-12-03 13:26:09 +01:00
casper
b75ba44a94
Add "readmore" button 2021-12-03 13:26:09 +01:00
casper
748101ce69
Remove banners when clicking close button 2021-12-03 13:26:06 +01:00
casper
5e4f67c7e1
Display different content on each of the marketplace onboarding banners 2021-12-03 13:26:02 +01:00
casper
9a1fbd54b0
Add basic onboarding banner to the market place 2021-12-03 13:25:57 +01:00
Ghostkeeper
7fe327fb48
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-12-03 13:25:56 +01:00
Ghostkeeper
6f65521ce8
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-12-03 13:25:54 +01:00
Ghostkeeper
3a284e3c2c
Show hover colour when hovering a card
This signals to the user they can select one.

Contributes to issue CURA-8565.
2021-12-03 13:25:54 +01:00
Ghostkeeper
8162bdcfa8
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-12-03 13:25:51 +01:00
Ghostkeeper
ecc3760e8e
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-12-03 13:25:48 +01:00
Jelle Spijker
02e2e0a1c6
Filter already installed packages from the install listviews
Contributes to: CURA-8587
2021-12-03 13:25:46 +01:00
Jelle Spijker
09bc28d840
Moved local package logic out of the LocalPackageList
Contributes to: CURA-8587
2021-12-03 13:25:46 +01:00
Jelle Spijker
66e52294b5
Get the locally installed packages
Contributes to: CURA-8587
2021-12-03 13:25:45 +01:00
Jelle Spijker
caa8da69b4
Fix section mismatch after package order changed
Contributes to: CURA-8587
2021-12-03 13:25:44 +01:00
Jelle Spijker
6514fdf9f2
Check the server if a package can be updated
The server is queried using the local packages_id and version to
determine if they can be updated. The Manage button state is set
accordingly. This is done in an async way to keep the UI responsive

A.t.m I'm not sure if I might need to move this logic out, since
we also need to make this query when check periodically for updates.
when the list is not shown. But that would also entail creating
the installed packages list before the Manage Packages tab is ever
created in the Marketplace.

Contributes to: CURA-8587
2021-12-03 13:25:43 +01:00
Ghostkeeper
0477ba44b2
Encode capabilities as comma-separated list
Previously it was encoded as a stringified Python list of strings, which is much harder to parse.
This would go wrong if any of these capabilities have a comma in them, but I think that would be bad practice for keywords like this anyway.

Contributes to issue CURA-8671.
2021-12-03 13:25:41 +01:00
Jelle Spijker
eb156f114c
Introduce a ManageButton
The state and styling of this coupled with the available options.
Discussed with UX that primary state: Install, Enable, Update while
secondary states are: Uninstall, Disable

Each primary/secondary state also has a busy state, with the verb
and spinner.

Contributes to: CURA-8587
2021-12-03 13:25:38 +01:00
Ghostkeeper
02d74b4226
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-12-03 13:25:35 +01:00
Ghostkeeper
2b419a2379
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-12-03 13:25:29 +01:00