Commit graph

229 commits

Author SHA1 Message Date
Nino van Hooff
59331666db Add missing cloud package manager
CURA-6983
2020-01-16 15:45:42 +01:00
Nino van Hooff
6763bed95f Fix Toolbox import error (continued)
(and remove unused import)

CURA-6983
2020-01-16 14:39:10 +01:00
Nino van Hooff
4ba8b4ae91 Fix Toolbox import error
(and remove unused import)

CURA-6983
2020-01-16 14:13:16 +01:00
Nino van Hooff
248a4cbb94 Fix merge issues
CURA-6983
2020-01-15 16:14:17 +01:00
Nino van Hooff
182bab6467 Merge remote-tracking branch 'origin/master' into CURA-6983_sync_packages
# Conflicts:
#	plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py
#	plugins/Toolbox/src/Toolbox.py
2020-01-15 15:40:03 +01:00
Nino van Hooff
1a1e8a9525 Fix rebase bug regarding package compatibility
CURA-6983
2020-01-15 11:54:34 +01:00
Nino van Hooff
88e5626b59 Fix more Mypy warnings
CURA-6983
2020-01-14 17:57:12 +01:00
Dimitriovski
e8f22beb27
Removed unnecessary function and a call to it. Added some typing.
CURA-7090
2020-01-14 11:50:47 +01:00
Dimitriovski
fbe38dc658
added typing, refactored some functions
CURA-7090
2020-01-13 09:55:18 +01:00
Dimitriovski
071326b890
Added logic for dismissing packages from the Incompatible list
CURA-7090
2020-01-11 01:11:49 +01:00
Dimitriovski
c86cc3ae5a
Added 'dismiss' link and logic for removing the item from the dialog
CURA-7090
2020-01-10 16:48:45 +01:00
Nino van Hooff
f15e21805c Remove unused member
CURA-6983
2020-01-10 14:29:21 +01:00
Nino van Hooff
35695e5ab6 Install and cloud-subscribe a package when after agreeing to the license
CURA-6983
2020-01-10 14:20:58 +01:00
Nino van Hooff
1cf3cd8228 Fix Subscribing to a package
CURA-6983
2020-01-10 13:17:48 +01:00
Nino van Hooff
88d210d12d Fix The toolbox license dialog
CURA-6983
2020-01-10 11:47:36 +01:00
Nino van Hooff
f79949a150 Use scope instead of manual request header updates in Toolbox.py
CURA-6983
2020-01-10 11:45:58 +01:00
Nino van Hooff
6069096141 CloudSync: documentation and cleanup
CURA-6983
2020-01-10 11:43:43 +01:00
Nino van Hooff
1a816ad010 Introduce the SyncOrchestrator
CURA-6983
2020-01-10 11:42:48 +01:00
Nino van Hooff
6eab5e2492 Add HttpRequestScope and fix the CompatibilityDialog
CURA-6983
2020-01-10 11:42:48 +01:00
Nino van Hooff
71000180fc Refactor cloud sync out of Toolbox.py
CURA-6983
2020-01-10 11:41:45 +01:00
Jaime van Kessel
f15e0c5477
Merge branch 'CURA-7038_remove_labels_if_no_packages' of github.com:Ultimaker/Cura 2020-01-09 13:25:39 +01:00
Jaime van Kessel
6e05393539
Merge branch 'CURA-6577_rebased' of github.com:Ultimaker/Cura 2020-01-09 13:14:46 +01:00
Dimitriovski
4b757b6be9
Added missing call to function from a refactoring 2020-01-08 17:34:51 +01:00
Dimitriovski
98a825fbf1
Rebased the subscribe function to use latest version of HttpRequestManager
CURA-6577
2020-01-08 11:51:07 +01:00
Dimitriovski
2a01d5c4a6
linting
CURA-7038
2020-01-07 15:20:28 +01:00
Dimitriovski
75d2a72424
Remove the label(s) from the compatibility dialog if there are no packages
CURA-7038
2020-01-07 14:19:31 +01:00
Lipu Fei
0a495b3f6f Remove unused code in Toolbox
CURA-6387
2020-01-07 12:44:45 +01:00
Lipu Fei
a84e6c3c92 Fix Toolbox due to network manager refactor
CURA-6387
2020-01-07 11:37:37 +01:00
Jaime van Kessel
0c1c4e4856
Move HttpRquestData to it's own file
CURA-6387
2020-01-06 11:34:32 +01:00
Lipu Fei
625b08baf8 Merge master and fix
CURA-6387
2020-01-06 11:18:12 +01:00
Lipu Fei
55d31b9846 Move HttpRequestManager to Uranium
CURA-6387
2020-01-03 08:59:29 +01:00
Lipu Fei
77511c2590 Use network manager in Toolbox
CURA-6387
2020-01-03 08:59:29 +01:00
Dimitriovski
802c095c9f
Removed unused list
CURA-7038
2019-12-31 14:07:40 +01:00
Dimitriovski
42851b0851
Removed unnecessary pass statement from reply.operation
CURA-7038
2019-12-31 14:03:56 +01:00
Dimitriovski
dde0dd8ce3
Removed the 'workaround' that I've added earlier. Simplified the flow. The dialog is now showing display_name instead of package_id
CURA-7038
2019-12-31 14:02:41 +01:00
Dimitriovski
96311c974b
Fixed failing tests. Hid the sync Message when it's clicked.
CURA-7038
2019-12-31 12:07:42 +01:00
Dimitriovski
ada2a776d5
Reworked the Compatibility Dialog and how it shows the subscribed packages
CURA-7038
2019-12-30 17:36:46 +01:00
Dimitriovski
12be21e594
Reworked the flow to show only not installed packages for installing in the Compatibility Dialog
CURA-7038
2019-12-23 17:23:26 +01:00
Dimitriovski
4375118a9f
Refactored most of the code into separate functions
CURA-7038
2019-12-23 16:58:44 +01:00
Dimitriovski
bd8c1e4c96
Initial implementation for the Compatibility Dialog window
CURA-7038
2019-12-23 15:18:09 +01:00
Dimitriovski
9cf5a388f3
Change for CURA-6979. Check for packages installed in Cloud MP but not in Cura MP.
CURA-7038
2019-12-20 13:59:45 +01:00
Dimitriovski
dc20db393e
Initial work for Compatiility Dialog done
CURA-7038
2019-12-20 13:10:22 +01:00
Dimitriovski
799e7fc48c
changed to use the new function name from UM
CURA-6979
2019-12-17 16:26:59 +01:00
Ghostkeeper
9870097ab5
Code style: Spaces around binary operators
Contributes to issue CURA-6979.
2019-12-17 16:11:47 +01:00
Ghostkeeper
1155b4bab2
Code style: Double quotes around strings
Contributes to issue CURA-6979.
2019-12-17 16:10:09 +01:00
Dimitriovski
d958e74467 Use the new name of the function from Uranium's PackageManager
CURA-6979
2019-12-16 15:57:49 +01:00
Dimitriovski
46d3a73e7e Some more refactoring
CURA-6979
2019-12-16 15:52:00 +01:00
Dimitriovski
3c2da64c94 Some refactoring done after code review
CURA-6979
2019-12-16 15:39:21 +01:00
Dimitriovski
ebc0813603 Refactored 'installed_plugins' to 'installed_packages' for brevity
CURA-6979
2019-12-16 10:53:56 +01:00
Dimitriovski
1f5df8fe79 Restore wrongly deleted code
CURA-6979
2019-12-16 10:43:55 +01:00