Commit graph

331 commits

Author SHA1 Message Date
casper
a0bb1eda94 Merge branch 'CURA-8587_disable_update_install_and_uninstall' into cura-8587_disable_update_install_and_update/licence_agreement 2021-12-06 17:10:27 +01:00
casper
4848c474e8 Implement UX design for maketplace license dialog
cura 8587
2021-12-06 17:10:13 +01:00
Ghostkeeper
f932239b6a
Implement aesthetics of busy indicator
Don't use the default spinner but use an image from our theme. A new image. And change the font size, colour and spacings a bit according to our designs.

Contributes to issue CURA-8587.
2021-12-06 16:52:47 +01:00
Jelle Spijker
c73ef84395
Show the correct busy message
Contributes to: CURA-8587
2021-12-06 16:47:53 +01:00
Ghostkeeper
c6501d6ade
Use capital letters for busy text
It seems though that the wrong text is shown here. In any case this looks more consistent.

Contributes to issue CURA-8587.
2021-12-06 16:25:50 +01:00
Ghostkeeper
e3eb82b022
Align read more label to the text, not the parent box
This is the same alignment as the ellipsis shown when the description is abbreviated. Looks correct, and it should be correct.

Contributes to issue CURA-8587.
2021-12-06 16:21:58 +01:00
Ghostkeeper
e646d53b53
Make quit button quit Cura
Contributes to issue CURA-8587.
2021-12-06 16:05:48 +01:00
Ghostkeeper
3c54964417
Use same content for button as old one
So make it dynamic based on the application name. This also causes the translation to be re-used.

Contributes to issue CURA-8587.
2021-12-06 16:05:48 +01:00
Ghostkeeper
3cae6d80b9
Show restart banner only when a restart is required
Contributes to issue CURA-8587.
2021-12-06 16:05:47 +01:00
casper
ec58cd2d0e Merge branch 'CURA-8587_disable_update_install_and_uninstall' into cura-8587_disable_update_install_and_update/licence_agreement
# Conflicts:
#	plugins/Marketplace/PackageList.py
2021-12-06 15:49:21 +01:00
casper
09e221d64a Add license dialog to the Marketplace
cura 8587
2021-12-06 14:49:50 +01:00
Jelle Spijker
28b6bfb729
Fixed the update button busy state
Contributes to: CURA-8587
2021-12-06 13:53:44 +01:00
Jaime van Kessel
09710c2d9f Remove unneeded connection
The connection isn't needed to handle a signal. There is an easier shorthand

CURA-8587
2021-12-06 12:02:14 +01:00
Jaime van Kessel
18837a32b8 Move verifiedIcon to it's own file
Cleaning up the size of the package card a bit
2021-12-06 11:54:14 +01:00
Jaime van Kessel
ea85e59e50 Fix margin
CURA-8587
2021-12-06 11:34:19 +01:00
Jaime van Kessel
de0dc568cd Change rectangle into item
It had no color, so it doesn't need to be a rectangle

Cura-8587
2021-12-06 11:30:27 +01:00
Jaime van Kessel
fbc9a25a8f Merge branch 'CURA-8587_disable_update_install_and_uninstall' of github.com:Ultimaker/Cura into CURA-8587_disable_update_install_and_uninstall 2021-12-06 11:28:26 +01:00
Jaime van Kessel
7a902f8314 Add restart required banner
CURA-8587
2021-12-06 11:28:06 +01:00
Jelle Spijker
325783ca46
Persistent handled state across Package Lists
Contributes to: CURA-8587
2021-12-06 10:19:14 +01:00
Jelle Spijker
863e92d0d2
Fixed state of manage buttons
Contributes to: CURA-8587
2021-12-06 09:14:40 +01:00
casper
58ee0d19fd Vertically align author components with manage buttons
To comply with UX design

cura 8587
2021-12-04 10:28:25 +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
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
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
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