6956 Commits

Author SHA1 Message Date
Nino van Hooff
46133fe2f3 Do not start Sync flow when there are no compatible packages to sync
(and remove unused import)

CURA-6983
2020-01-16 14:44:37 +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
52d2fa47e9 Merge remote-tracking branch 'origin/master' 2020-01-16 14:13:29 +01:00
Nino van Hooff
4ba8b4ae91 Fix Toolbox import error
(and remove unused import)

CURA-6983
2020-01-16 14:13:16 +01:00
Ghostkeeper
d18c0703b4
Fix getting correct initial extruder number
As found in the discussion in #6847.

This was done as a 5 minute fix.
2020-01-16 13:59:02 +01:00
Jaime van Kessel
ab6effb712
No longer use sceneLock for startSliceJob 2020-01-16 12:58:01 +01:00
Jaime van Kessel
fa3a985404
Rename 2 functions that didn't adhere to codestyle
CURA-6983
2020-01-15 16:57:40 +01:00
Jaime van Kessel
0f7f39745d
Add missing typing
CURA-6983
2020-01-15 16:57:10 +01:00
Jaime van Kessel
f12501aec4
Move the message to body instead of title
CURA-6983
2020-01-15 16:46:04 +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
15dc866cbe Provess some code review comments
CURA-6983
2020-01-15 15:26:31 +01:00
Nino van Hooff
b1ecfb627d Only emit compatible packages from DiscrepanciesPresenter
CURA-6983
2020-01-15 12:00:01 +01:00
Nino van Hooff
1a1e8a9525 Fix rebase bug regarding package compatibility
CURA-6983
2020-01-15 11:54:34 +01:00
fieldOfView
6abf916ced Fix typing in __init__ methods to appease MYPY 2020-01-14 21:56:06 +01:00
Nino van Hooff
88e5626b59 Fix more Mypy warnings
CURA-6983
2020-01-14 17:57:12 +01:00
Dimitriovski
15a3922436
Removed unnecessary checks
CURA-7090
2020-01-14 14:07:55 +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
7359492e11
Added a Tooltip over the Dismiss button. Changed the cursor on hover. 2020-01-13 11:44:23 +01:00
Dimitriovski
071cf5517e
linting
CURA-7090
2020-01-13 10:37:40 +01:00
Nino van Hooff
53115dc3b2 Fix Mypy warnings
CURA-6983
2020-01-13 09:57:35 +01:00
Nino van Hooff
6aba835c1c Only show restart dialog when packages were installed
CURA-6983
2020-01-13 09:57:14 +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
2da8040e5a Show a restart dialog at the end of the cloud sync flow
CURA-6983
2020-01-10 15:49:18 +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
317061029c Use more high-level temporary file api
CURA-6983
2020-01-10 11:45:59 +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
89994b92b5 Finished LicensePresenter
CURA-6983
2020-01-10 11:43:42 +01:00
Nino van Hooff
dda3d0b4eb Fix downloadPresenter and initial LicensePresenter.py code
CURA-6983
2020-01-10 11:43:42 +01:00
Nino van Hooff
84e676c1f8 Download packages to be installed and show a message with progress.
CURA-6983
2020-01-10 11:42:48 +01:00
Nino van Hooff
883243b533 Move UltimaterCloudScope to Cura project
CURA-6983
2020-01-10 11:42:48 +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
Dimitriovski
e5f464f7e7
typing 2020-01-10 10:44:29 +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
6240522cd6
removed print statement 2020-01-07 14:44:46 +01:00
Dimitriovski
fc504a7cb6
Removed redundant string comparison
CURA-7038
2020-01-07 14:43:49 +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
Jaime van Kessel
a1f8c3f281
Merge branch 'CURA-6255_incorrect_usage_of__file__' of github.com:Ultimaker/Cura 2020-01-07 14:10:19 +01:00