Commit graph

331 commits

Author SHA1 Message Date
casper
62596a42e6 Remove un-needed column component
CURA-8587
2021-12-15 10:44:25 +01:00
casper
5f444fa5b7 Simplify enabled busy state
both the `installManageButton` and `updateManageButton` are busy when
`packageData.busy`, so the
`!(installManageButton.busy || updateManageButton.busy)` check didn't
make much sense.

CURA-8587
2021-12-14 17:49:25 +01:00
casper
c338d8f5ce Only show enable/disable button if plugin is installed
CURA-8587
2021-12-14 16:37:16 +01:00
Jaime van Kessel
08eba9f21a Fix updating package
CURA-8587
2021-12-13 15:17:19 +01:00
Jaime van Kessel
d50dc59aac Simplifications and cleanup
CURA-8587
2021-12-13 15:13:00 +01:00
Jaime van Kessel
d422e0d4ee Simplify onClicked for install button
CURA-8587
2021-12-13 14:18:50 +01:00
Jaime van Kessel
62f99a28b3 Simplify the update logic in the package model / card
CURA-8587
2021-12-13 14:15:16 +01:00
Jaime van Kessel
4b358496d9 Simplify enable/disable button visibility
CURA-8587
2021-12-13 13:15:16 +01:00
Jaime van Kessel
aa29114470 Correctly set defaults of managebutton
CURA-8587
2021-12-13 13:13:42 +01:00
Jaime van Kessel
8c0d4899ed Remove unneeded {}
CURA-8587
2021-12-13 13:12:06 +01:00
Jaime van Kessel
274b98f9b1 Remove unneeded "primary_action" from managebutton 2021-12-13 13:09:17 +01:00
Jaime van Kessel
08685af9de Switch ManageButton over to implicitWidth & height instead of layout
This makes it a much easier to re-use component.

CURA-8587
2021-12-13 12:24:18 +01:00
Jaime van Kessel
f993243d57 Remove unneeded import
CURA-8587
2021-12-13 12:08:33 +01:00
Jelle Spijker
e72655cc22
Moved busy/confirmed logic to QML
COntributes to CURA-8587
2021-12-10 17:38:20 +01:00
Jelle Spijker
a571e87553
Fixed the spinner
Contributes to CURA-8587
2021-12-10 12:39:44 +01:00
Jelle Spijker
d9f77d7ffd
Moved the update logic to the PackageManager
Contributes to CURA-8587
2021-12-10 11:14:51 +01:00
casper
4991c39535 Make sure ManageButton has the correct width and height
Cura 8587
2021-12-09 22:41:14 +01:00
Jelle Spijker
1adae61f39
Enable and disabled now toggle correctly
Contributes to: CURA-8587
2021-12-09 15:49:05 +01:00
Jelle Spijker
4c5ca22b24
Handle bundled packages which can be Downgraded
Contributes to: CURA-8587
2021-12-09 12:04:47 +01:00
Jelle Spijker
8a583a4323
Fixed Enable button text and style
Contributes to: CURA-8587
2021-12-09 10:27:27 +01:00
Jelle Spijker
0299bb1694
Fixed update buttons
Contributes to: CURA-8587
2021-12-09 10:24:26 +01:00
Jelle Spijker
8dc88e52c2
Don't show the Enable buttons for materials
Contributes to: CURA-8587
2021-12-09 10:03:56 +01:00
Jelle Spijker
51a77f683d
Moved stateManageButton logic out of the packageModel
Contributes to: CURA-8587
2021-12-09 09:56:41 +01:00
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