8896 Commits

Author SHA1 Message Date
Ghostkeeper
a084b689b5
Add one remaining forgotten type import
Contributes to issue CURA-8587.
2021-12-06 17:26:12 +01:00
casper
324b456cbd Merge branch 'CURA-8587_disable_update_install_and_uninstall' into cura-8587_disable_update_install_and_update/licence_agreement 2021-12-06 17:23:31 +01:00
Ghostkeeper
aec643fd44
Fix several typing issues
Contributes to issue CURA-8587.
2021-12-06 17:22:07 +01:00
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
0cc9d8db68 Use existing plugin registry
Fix after merge

cura 8587
2021-12-06 15:51:19 +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
c3665d7440 Correctly handle actions from marketplace license prompt
Install package on accept
And stop spinner on decline

cura 8587
2021-12-06 15:45:27 +01:00
casper
09e221d64a Add license dialog to the Marketplace
cura 8587
2021-12-06 14:49:50 +01:00
Jelle Spijker
1cc3d374a0
Show the uninstall button for packages which can be downgraded to the bundled version
Contributes to: CURA-8587
2021-12-06 14:11:31 +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
b28cb5ad5e 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 12:02: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
Jelle Spijker
579cc7bdbc
Enable or disable a plugin functionality added
Contributes to: CURA-8587
2021-12-06 11:34:36 +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
Jaime van Kessel
a64aa6ef2d
Merge pull request #10989 from Ultimaker/CURA-8671_dont_send_materials_to_um2c
[CURA-8671] Don't send materials to printers that can't receive them
2021-12-06 09:48:18 +01:00
Jelle Spijker
2d9c557a13
Only check for updates when logged in
Contributes to: CURA-8587
2021-12-06 09:43:09 +01:00
Jelle Spijker
863e92d0d2
Fixed state of manage buttons
Contributes to: CURA-8587
2021-12-06 09:14:40 +01:00
Jelle Spijker
305fb4ab09
renamed locally_installed property
Contributes to: CURA-8587
2021-12-05 16:23:23 +01:00
Jelle Spijker
bd2f270803
Added typing
Contributes to: CURA-8587
2021-12-05 15:18:51 +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
c937337324
Change the state of the enable button after an un-/install
Contributes to: CURA-8587
2021-12-03 17:21:38 +01:00
Jelle Spijker
743ac67cdb
un-/subscribe the user to installed packages
Contributes to: CURA-8587
2021-12-03 17:08:28 +01:00
Jelle Spijker
a83a598e96
Added error handling when downloading packages failed
A simple callback function which ensures that the proper signals
are emitted when we fail to retrieve the package.

Contributes to: CURA-8587
2021-12-03 15:50:51 +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
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
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