Commit graph

70 commits

Author SHA1 Message Date
Remco Burema
c20b2c6ee0
Merge pull request #7211 from Ultimaker/CURA-7150_proper_http_request_headers
CURA-7150_proper_http_request_headers
2020-03-24 11:25:07 +01:00
Nino van Hooff
72a66f1358 Do not use the JsonDecorator scope for binary downloads
CURA-7150
2020-03-20 17:31:21 +01:00
Nino van Hooff
96ed85f9c0 Move UltimakerCloudAuthentication and UltimakerCloudScope
...to their own module
Fixes an import error where UltimakerCloudScope was used my both the
Toolbox and CuraDrive plugins

CURA-7150
2020-03-12 17:48:54 +01:00
Nino van Hooff
7e2177a8cd Rename _loginStateChanged for consistency
CURA-7251
2020-02-25 16:25:03 +01:00
Nino van Hooff
cf689ee3b0 Hide the Cloud Sync message when the user logs out
CURA-7251
2020-02-25 16:21:06 +01:00
Nino van Hooff
27902fe38f Use JsonDecorator scope in the Toolbox and CloudSync
Improves security by disallowing other content than json for requests

CURA-7150
2020-02-25 14:41:02 +01:00
Ghostkeeper
f918f39fc2
Don't use a newline at the beginning of the sync message
Again, this breaks stuff. See the previous commit.

Contributes to issue CURA-7201.
2020-02-24 14:33:10 +01:00
Ghostkeeper
633bdac21a
Don't start message with a newline
That breaks a couple of things:
* It messes up the layout of the message.
* The translations need to have this newline in as well, or they won't be accepted by gettext.
* The x-test translation puts 'xxxx' before the translation, so this one won't compile any more.

Contributes to issue CURA-7201.
2020-02-24 14:21:39 +01:00
Dimitriovski
3e13507156
Merge branch '4.5' of github.com:Ultimaker/Cura 2020-02-24 11:03:21 +01:00
Dimitriovski
9282423db1
Added lifetime=0 to the sync_message to make it stay there 2020-02-24 10:59:41 +01:00
Jaime van Kessel
238dd733ea
Merge branch '4.5' of github.com:Ultimaker/Cura 2020-02-17 17:01:38 +01:00
Nino van Hooff
507459660e Refactor: rename CloudPackageManager to CloudApiClient 2020-02-14 16:33:24 +01:00
Nino van Hooff
72c1b4d10c Fix LicensePresenter: reset state when presenting licenses
CURA-7200
2020-02-11 13:34:17 +01:00
Nino van Hooff
a33cfdfba6 Simplify package compatibility checking
CURA-7207
2020-02-11 11:21:28 +01:00
Ghostkeeper
ea9a9d58b1
Fix typing of list of API versions
Contributes to issue CURA-7207.
2020-02-11 11:09:02 +01:00
Ghostkeeper
0c42b1fdea
Code style: Method names with lower camelcase
Contributes to issue CURA-7207.
2020-02-11 11:06:33 +01:00
Ghostkeeper
bcf4bc8138
Simplify _is_any_version_compatible
It now literally says: for any version, is it compatible?

Contributes to issue CURA-7207.
2020-02-11 11:02:32 +01:00
Nino van Hooff
5beba6050f Fix api version checking
CURA-7207
2020-02-11 09:52:39 +01:00
Nino van Hooff
050ff62344 Don't show license Screen when there are no licenses to show
CURA-7198
2020-02-07 13:47:15 +01:00
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