3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
24057 commits 306 branches 270 tags 786 MiB
Commit graph

651 commits

Author SHA1 Message Date
Ghostkeeper
f8a88642c2
Don't crash when failing to create Toolbox.qml dialogue 
Basically we should never be raising the master Exception class, really.
The enclosing class has error handling in case this returns None already, so this fix is easy.

Contributes to Sentry issue CURA-Y5.
 2020-06-18 14:53:18 +02:00
Nino van Hooff
1024879f9d Process Review feedback for CURA-7438 
Renames UltimakerCloudAuthentication to UltimakerCloudConstants

Cura-7438
 2020-06-09 13:41:30 +02:00
Jaime van Kessel
fd2a7689cc
Remove overly spammy logging 2020-06-04 14:32:37 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
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
Jelle Spijker
5ae4ce3b9b
Revised text from Enterprise marketplace pop-up screen 
Updated the qml WelcomPage with the revised text:
"Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise"
 2020-04-22 15:20:39 +02:00
Jelle Spijker
2f632def86
Removed logobot image from Enterprise marketplace pop-up screen 
Updated the qml WelcomPage to no longer show the logobot and removed the logobot.svg
from the resources since it is no longer used.
 2020-04-22 15:18:48 +02:00
Nino van Hooff
7302e8ba7f Update missed sdk versions from 7.1 to 7.2.0 for Cura 4.6 
CURA-7383
 2020-04-21 11:46:12 +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
Jaime van Kessel
8ba71fde44
Merge branch 'split_bundled_unbundled_option_2' of github.com:Ultimaker/Cura 2020-04-02 14:34:17 +02:00
Remco Burema
8d6cbdf673
Fix long materials title causes misalign. 
CURA-7240
 2020-04-01 17:57:33 +02:00
Remco Burema
07569c6b88
Fix extra line after plugin/materials list. 
CURA-7240
 2020-04-01 17:54:56 +02:00
Ghostkeeper
4edef85346
Code style: Space around binary operators 
Contributes to issue CURA-7240.
 2020-04-01 17:35:40 +02:00
Remco Burema
90ffa2a772
Explain empty installed materials/plugins brackets. 
part of CURA-7240
 2020-03-31 16:56:45 +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
d89fce6240
Order bundled/installed packages/materials section. 
And other finishing touches.
part of CURA-7240
 2020-03-31 12:02:46 +02:00
Remco Burema
85490dc58a
[Marketplace] De-emphasize pre-installed packages. 
Tried to do it the elegant way, couldn't get that to work within timebox.
part of CURA-7240
 2020-03-31 11:52:55 +02:00
Kostas Karmas
189c734145 Changed wrapMode to WordWrap, similar to master 
CURA-7332
 2020-03-31 11:41:03 +02:00
Kostas Karmas
5581705a0f Revert "Wrap the restart prompt text in Marketplace" 
This reverts commit 2978b09e26.
 2020-03-31 11:32:34 +02:00
Kostas Karmas
2978b09e26 Wrap the restart prompt text in Marketplace 
CURA-7332
 2020-03-31 11:24:23 +02:00
Kostas Karmas
6b6446e201 Wrap the restart prompt text in Marketplace 
CURA-7332
 2020-03-31 11:22:07 +02:00
Jaime van Kessel
da4bb127df
Add wordWrap to restart required message 
In some languages (and on some operating systems) the
text would be cut off by the button
 2020-03-31 10:56:03 +02:00
konskarm
bba6a5cc39
Merge pull request #7144 from Ultimaker/CURA-7162/replace_robot_with_placeholder 
CURA-7162/Replace the default logobot.svg with a new placeholder
 2020-03-30 15:05:37 +02:00
Kostas Karmas
136fc90f48 Merge branch 'master' into CURA-7310_Template_export_inkection_call_custom_openUrl 2020-03-24 16:59:27 +01:00
Kostas Karmas
eaef9f0f45 Open plugin author page with custom openUrl 
CURA-7310
 2020-03-24 16:42:46 +01:00
Kostas Karmas
4f0f7dec5e Open material author page with custom openUrl 
CURA-7310
 2020-03-24 16:42:22 +01:00
Kostas Karmas
92cef02ee5 Open "buy material spool" with custom openUrl 
CURA-7310
 2020-03-24 16:38:25 +01:00
Kostas Karmas
e003d76c1e Open links in materials with custom openUrl 
CURA-7310
 2020-03-24 16:36:09 +01: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
Ghostkeeper
b572fc68de
Don't hard-code the application name 
As a response to the comment on commit d501f7730a.
 2020-03-06 15:54:23 +01:00
Jaime van Kessel
d501f7730a
Show Full name for quit message 
We're a bit insecure about Cura, so we have to put the company name in front of it ;)
 2020-03-02 10:48:47 +01:00
Dimitriovski
24e2fc89e5
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7162/replace_robot_with_placeholder 2020-02-27 11:20:38 +01:00
Dimitriovski
77cf63acfa
Removed the new placeholder from WelcomePage.qml as we probably want to see the Robot there instead of the hexagon. 
CURA-7162
 2020-02-27 11:20:32 +01:00
Dimitriovski
1acfaf9705
added sourceSize property to qml's Image for better rendering 
CURA-7162
 2020-02-27 11:19:44 +01:00
Nino van Hooff
7e2177a8cd Rename _loginStateChanged for consistency 
CURA-7251
 2020-02-25 16:25:03 +01:00