Commit graph

101 commits

Author SHA1 Message Date
Jaime van Kessel
15d83cc6da
Fix typing issue 2020-02-04 13:38:52 +01:00
Ghostkeeper
66e2ca6aa5
Merge branch 'CURA-7099_sync_sideloaded_plugins' 2020-02-03 16:12:56 +01:00
Jaime van Kessel
1fc0705c31
Remove a bit of over verbose logging
It would put the content of the entire licence file into the log,
which seems a bit much to me.
2020-02-03 13:20:08 +01:00
Nino van Hooff
a02b753d53 Count the number of packages which have a license to display
CURA-7155
2020-01-30 16:42:42 +01:00
Ghostkeeper
d437d480dc
Code style: Spaces around binary operators
Contributes to issue CURA-7099.
2020-01-30 16:10:36 +01:00
Nino van Hooff
eec7d2f0cd Use default timeout for sync dialog 2020-01-30 14:56:19 +01:00
Nino van Hooff
8c250cfbbc Process review comments
CURA-7099
2020-01-29 11:28:29 +01:00
Nino van Hooff
d4eb463f2d Always subscribe to packages after installing them
Now that we subscribe for all situations where a package is installed,
it makes sense to watch package installs and create a 1:1 relation that
way. Prevents code duplication.

CURA-7099
2020-01-28 13:08:57 +01:00
Dimitriovski
2e0fef3bd4
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition 2020-01-27 13:25:35 +01:00
Dimitriovski
aa2c612925
PR review changes 2020-01-27 13:25:29 +01:00
Dimitriovski
537891d80b
Further improvements and refactors to the CloudPackageChecker 2020-01-24 16:05:35 +01:00
Dimitriovski
526cdac200
fixed silly merge conflict 2020-01-24 15:41:13 +01:00
Dimitriovski
38c7d80f82
Refactored the onConfirmClicked function. Added the ability to auto-dismiss the incompatible packages. Changed the button text depending on the displayed list 2020-01-24 15:39:58 +01:00
Dimitriovski
d829405347
Update plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py 2020-01-24 14:54:12 +01:00
Dimitriovski
05e17843c6
Removed previous variants of the dismiss incompatible package functionality
CURA-7090
2020-01-24 13:56:59 +01:00
Dimitriovski
7ee8270b2e
Added the mechanism to dismiss all Incompatible packages when the Compatibility Dialog is closed
CURA-7090
2020-01-24 13:51:49 +01:00
Dimitriovski
ae494110ba
Removed unnecessary line (because we still want to show the Compatability Dialog even if there are only Incompatible packages)
CURA-7090
2020-01-24 11:28:36 +01:00
Nino van Hooff
a02e8d3b58 Use display_name for the package name in the license dialog
Implemented for both CloudSync and Toolbox
2020-01-24 10:36:36 +01:00
Nino van Hooff
95def2850d Make license decline button text context-dependant
CURA-7129
2020-01-22 11:17:29 +01:00
Nino van Hooff
b3812a3630 Add icon to licenseDialog (clowd flow)
CURA-7129
2020-01-21 17:07:21 +01:00
Dimitriovski
369329c476
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition 2020-01-21 15:08:24 +01:00
Dimitriovski
5c498de1e4
Use meaningful variable name && some TODOs for later.
CURA-7090
2020-01-21 15:07:11 +01:00
Dimitriovski
e7ed93c132
fixed typing
CURA-7090
2020-01-21 14:51:53 +01:00
Dimitriovski
8abaa60052
Passed the sdk_version to the reevalute() function
CURA-7090
2020-01-21 11:24:31 +01:00
Dimitriovski
365c30fadb
Added check to reevaluate dismissed incompatible packages (in case the package gets updated and has the correct SDK version)
CURA-7090-addition
2020-01-21 09:52:33 +01:00
Nino van Hooff
b03be75a13 Show error messages for cloud flow errors
- failed downloads
- failed installs

CURA-6984
2020-01-17 13:54:39 +01:00
Nino van Hooff
4e8534b93b Unsubscribe from package when a license is declined (cloud flow)
CURA-6984
2020-01-17 13:54:39 +01:00
Nino van Hooff
8dffed9195 Fix 2 mypy errors
CURA-6983
2020-01-16 14:58:09 +01:00
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
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
Nino van Hooff
88e5626b59 Fix more Mypy warnings
CURA-6983
2020-01-14 17:57:12 +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
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
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
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
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