26851 Commits

Author SHA1 Message Date
casper
c66e17dd9e Show install button after package has been uninstalled
CURA-8587
2021-12-15 15:13:38 +01:00
casper
2bf8309d45 Merge remote-tracking branch 'origin/CURA-8587_disable_update_install_and_uninstall' into CURA-8587_disable_update_install_and_uninstall 2021-12-15 15:09:32 +01:00
Jelle Spijker
8b2ced122c
Explicitly close the downloaded curapackage
Sometime very small curapackage where download and the `canInstallChanged`
signal was emitted before the zipfile was completely processed.
This could result in a failed installation, which was often the case for
materials.

I also narrowed down the try-catch block.
2021-12-15 15:07:23 +01:00
casper
33f1bd8c5d Simplify CuraPackageManager
CURA-8587
2021-12-15 14:18:40 +01:00
casper
62596a42e6 Remove un-needed column component
CURA-8587
2021-12-15 10:44:25 +01:00
casper
aea316799a Always set busy = False on installed package
CURA-8587
2021-12-15 10:43:57 +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
Jaime van Kessel
e92cc584fb Add missing return type
CURA-8587
2021-12-13 12:01:37 +01:00
Jaime van Kessel
50f1afa5d9 Make plugin_registry protected
CURA-8587
2021-12-13 11:57:00 +01:00
Jaime van Kessel
eb11e92637 Rename local_packages_id to local_packages_ids
CURA-8587
2021-12-13 11:54:13 +01:00
Jelle Spijker
4f997319b0
Try sorting on section, update and display name
Contributes to CURA-8587
2021-12-10 18:31:55 +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
d876b85259
Don't forcefully remove bundled packages when updating
Contributes to CURA-8587
2021-12-10 12:43:42 +01:00
Jelle Spijker
11c2ccd227
Use the ongoing_request queue
Contributes to CURA-8587
2021-12-10 12:41:37 +01:00
Jelle Spijker
a571e87553
Fixed the spinner
Contributes to CURA-8587
2021-12-10 12:39:44 +01:00
Jelle Spijker
9b7731a21b
Use package_infos to obtain the url
Contributes to CURA-8587
2021-12-10 11:50:38 +01:00
Jelle Spijker
ec8254bca9
Fixed old Marketplace update functionality
Contributes to CURA-8587
2021-12-10 11:50:02 +01:00
Jelle Spijker
e0754c7015
Disabled old toolbox functionality for updating
The signals messed up the new update process.

Contributes to CURA-8587 and relates to CURA-8588
2021-12-10 11:16:08 +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
9874b0c8ba
removed redundant dunders from helper class
Contributes to: CURA-8587
2021-12-09 15:14:20 +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
4c516e8cec
Moved QObject out if TYPE_CHECKING statement
Contributes to: CURA-8587
2021-12-08 16:14:59 +01:00
Jelle Spijker
e4d469b6a1
Added some typing annotation
Contributes to: CURA-8587
2021-12-08 16:13:46 +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
Jelle Spijker
df0c502961
Removed redundant pyQtSlots
Contributes to: CURA-8587
2021-12-08 14:48:47 +01:00
Jelle Spijker
e0ca0d5446
Renamed recently_install to better depict the usage
This flag is an indication if the package. was recently un-/installed

Contributes to: CURA-8587
2021-12-08 14:46:34 +01:00
casper
4a436b5598 Display different types of manage buttons through Loader.sourceComponent
cura 8734
2021-12-08 14:46:29 +01:00