358 Commits

Author SHA1 Message Date
Jelle Spijker
59470814e2
Show spinner again
Contributes to: CURA-8587
2021-12-09 08:30:22 +01:00
Jelle Spijker
7734bf5169
Show Install and Update buttons in the correct scenario's
Contributes to: CURA-8587
2021-12-09 07:58:14 +01:00
casper
8708fd0f3a Merge remote-tracking branch 'origin/CURA-8587_disable_update_install_and_uninstall' into CURA-8587_disable_update_install_and_uninstall
# Conflicts:
#	plugins/Marketplace/resources/qml/PackageCard.qml
#	plugins/Marketplace/resources/qml/PackagePage.qml
2021-12-08 20:01:55 +01:00
casper
d405652db7 Combine dublicated elements from PackageCard and PackagePage into
reusable component `PackageCardHeader`

cura 8734
2021-12-08 19:41:50 +01:00
Jelle Spijker
9f41115bc1
Rework of the ManageButton
Now uses the internal signal

Contributes to: CURA-8587
2021-12-08 18:47:56 +01:00
Jelle Spijker
fb950e39c9
Merge pull request #11037 from Ultimaker/CURA-8734_Package_card_refactor
Cura 8734 package card refactor
2021-12-08 16:08:24 +01:00
casper
c72fd12ea2 Make ManageButton a reusable Component
cura 8734
2021-12-08 15:50:00 +01:00
casper
4a436b5598 Display different types of manage buttons through Loader.sourceComponent
cura 8734
2021-12-08 14:46:29 +01:00
Jelle Spijker
fd508342fe
Renamed Manager to RestartManager
Contributes to: CURA-8587
2021-12-08 14:33:22 +01:00
casper
fb92f1f49a Merge branch 'CURA-8587_disable_update_install_and_uninstall' into CURA-8734_Package_card_refactor 2021-12-08 14:28:31 +01:00
Remco Burema
27cb1d2d9f
Also have/keep the uninstalled status displayed.
'isRecentlyInstalled' was both for installing _and_ uninstalling. Will add the rename to the refactor later on.

part of CURA-8587
2021-12-08 14:04:19 +01:00
casper
5e35e19f21 Split PackageCard into PackageCard and PackagePage
cura 8734
2021-12-08 10:53:51 +01:00
Jelle Spijker
7be2da587b
Automatic abortRequest for each API request
Defensive programming

Contributes to: CURA-8587
2021-12-08 10:18:08 +01:00
Jelle Spijker
6c976bc9b0
Introduced a Manager to centralize plugin/package management
Should have done this from the start.
Will move other relevant scattered functions to this type.
For now it checks if the restart banner needs to show.
Taking into account that a user can toggle between enable
and disable without an actual restart. Even with multiple
plugins.

Contributes to: CURA-8587
2021-12-08 08:06:56 +01:00
Remco Burema
a61c3e9eff
Peristance of 'Installed' text.
part of CURA-8587
2021-12-07 21:23:54 +01:00
Jelle Spijker
3be6747e5d
Trying to set a persistent install managebutton
Contributes to: CURA-8587
2021-12-07 18:25:46 +01:00
Jelle Spijker
14bc196154
Hidden other manage buttons when the other is confirmed
Contributes to: CURA-8587
2021-12-07 16:09:07 +01:00
Jelle Spijker
bb9696c39f
Reset button if user declines license
Contributes to: CURA-8587
2021-12-07 15:06:46 +01:00
Jelle Spijker
5b3e9079ed
Don't show en-/disable button when un-/installed
Contributes to: CURA-8587
2021-12-07 12:46:45 +01:00
Jelle Spijker
ca76bcc29c
Show a conformation message after a successful manage action
Contributes to: CURA-8587
2021-12-07 12:23:04 +01:00
Jelle Spijker
1c0e484069
Only show manage buttons in manage tab or detail view
Contributes to: CURA-8587
2021-12-07 11:25:16 +01:00
Jelle Spijker
f6966c25fb
Some final tweaks and added missing documentation
Contributes to: CURA-8587
2021-12-07 09:48:48 +01:00
Jelle Spijker
0fefe85fca
Present restart banner if plugin has been en-/disabled
Contributes to: CURA-8587
2021-12-07 08:57:56 +01:00
casper
dc03a7fdcb Correctly handle accept and reject hotkeys in marketplace license dialog
Accept license on "enter"
Reject license on "escape" or dialog close

cura 8587
2021-12-07 08:18:26 +01:00
casper
71a43060a6 Open separate license dialog with each plugin install
Previously the license dialog was instanciated once and re-used for each
install. As the dialog is only shown after the plugin is downloaded it
was possible to click install for multiple plugins. Plugins that finish
downloading later would override the dialog of earlier downloaded
plugins. Clicking "accept" would then only install the latest downloaded
plugin.

Now for each install a separate dialog is shown. Accepting the license
agreement would only install the recently accepted plugin.

Note: in the current form the license agreement does not show any
identification to what plugin triggered the dialog. As multiple dialogs
can be shown at once this might be unclear.

cura 8587
2021-12-06 19:34:02 +01:00
casper
455f6f1791 Update licencing comment
cura 8587
2021-12-06 18:12:58 +01:00
casper
49a6a83fe9 Move button text inside QML element
cura 8587
2021-12-06 17:50:18 +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
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