GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-10-07 19:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,709 Commits 295 Branches 268 Tags
Commit Graph

347 Commits

Author SHA1 Message Date
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
 2020-05-28 17:31:24 +02:00
Nino van Hooff
d96359f208 Convert doxygen to rst for Toolbox, TrimeshReader 2020-05-15 13:53:10 +02:00
Nino van Hooff
a3f968188f Add timeout to CloudPackageChecker request 
Prevents it from getting stuck in the SYNCING state

CURA-7290
 2020-05-14 15:14:51 +02:00
Nino van Hooff
fbc0be30ec Fix typing issue in CloudPackageChecker 
CURA-7290
 2020-05-12 15:40:53 +02:00
Nino van Hooff
b40b8e8489 Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync 
# Conflicts:
#	cura/API/Account.py
 2020-05-12 14:59:01 +02:00
Nino van Hooff
1ae050bbc5 Expose Account.SyncState as an Enum to QML 
Provides a single source of truth

CURA-7290
 2020-05-08 11:09:48 +02:00
Nino van Hooff
9b79b70f2b Merge branch 'CURA-7290_auto_sync_packages' into CURA-7290_manual_account_sync 
# Conflicts:
#	cura/API/Account.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
 2020-05-06 16:03:37 +02:00
Nino van Hooff
3ac0e7bed9 Consider all packages when calculating account discrepancies 
Not just the user-subscribed ones

CURA-7245
 2020-05-06 16:01:36 +02:00
Nino van Hooff
5b245434d0 Add _last_check_packages type hint 
CURA-7290
 2020-05-04 17:32:54 +02:00
Nino van Hooff
eac884fcd2 Convert SYNC_STATES to Enum 
CURA-7290
 2020-05-04 17:26:38 +02:00
Nino van Hooff
88ff68e40c Also check for package updates automatically 
Moves the 30-second sync timer from CloudOutputDeviceManager to
Account and subscribes CloudPackageChecker to the timer.

CURA-7290
 2020-05-04 16:56:09 +02:00
Nino van Hooff
eeea1692fd Register CloudPackageChecker as Account sync service 
CURA-7290
 2020-05-04 14:08:36 +02:00
Jaime van Kessel
ab62ac6e01
Merge branch 'CURA-7364_cloud_sync_message_duplicated' of github.com:Ultimaker/Cura into 4.6 2020-04-16 13:17:40 +02:00
Nino van Hooff
db758a7e19 Add None-checks to CloudPackageChecker 
Might help prevent the sync message to show multiple times

CURA-7364
 2020-04-15 17:16:38 +02:00
Ghostkeeper
4edef85346
Code style: Space around binary operators 
Contributes to issue CURA-7240.
 2020-04-01 17:35:40 +02:00
Jaime van Kessel
c764326c25
Fix marketplace installed plugins/materials empty rectangle 
CURA-7240
 2020-03-31 15:57:08 +02:00
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
61af28c681 Process review comments. 
CURA-7150
 2020-03-12 13:57:09 +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
Dimitriovski
2b11152c4d
Added a comment(explanation) to an unused code of the Toolbox. 2020-02-25 12:06:11 +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
konskarm
35903e7dd3
Merge pull request #6988 from Ultimaker/CURA-7071 
CURA-7071/Added option to redirect to Web MP from Cura MP
 2020-02-04 11:02:30 +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
Jaime van Kessel
d15e64cc5b
Remove unused import 2020-01-30 09:44:15 +01:00
Jaime van Kessel
18163af5a3
Ensure that the default default marketplace URL is used when not defined 
CURA-7071
 2020-01-30 09:42:51 +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
Ghostkeeper
13644f7e41
Load different pages of Marketplace depending on current tab 
Feels intuitive actually, but if you think about it it's weird that the link should change depending on the tab that's next to it.

Contributes to issue CURA-7071.
 2020-01-28 11:58:56 +01:00
Ghostkeeper
ad2b8f140e
Make Marketplace link configurable from the build system 
This way you could set it to marketplace-staging if you like.

Contributes to issue CURA-7071.
 2020-01-28 11:52:46 +01:00