3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 18:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
34169 commits 302 branches 270 tags 773 MiB
Commit graph

9705 commits

Author SHA1 Message Date
Dimitriovski
eb3bd811c1
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition 2020-01-24 11:27:05 +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
Jaime van Kessel
57648e2bb0
Merge branch 'CURA-6627_Store_extra_data_project_files' of github.com:Ultimaker/Cura into CURA-6627_Store_extra_data_project_files 2020-01-23 09:29:18 +01:00
Jaime van Kessel
87fb0d7df3
Fix incorrect read location for plugin metadata 
CURA-6627
 2020-01-23 09:28:28 +01:00
Nino van Hooff
b25d6360ab More documentation for UltimakerCloudScope 2020-01-22 11:53:48 +01:00
Nino van Hooff
1324969dc2 Add some documentation for HttpRequestScope 2020-01-22 11:50:22 +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
3b534ea986 Add icon to licenseDialog (Toolbox flow) 
CURA-7129
 2020-01-22 10:54:05 +01:00
Nino van Hooff
2f3cf3c493 LicenseDialog layout tweaking 
CURA-7129
 2020-01-22 10:53:43 +01:00
Nino van Hooff
b3812a3630 Add icon to licenseDialog (clowd flow) 
CURA-7129
 2020-01-21 17:07:21 +01:00
Ghostkeeper
a3825c1f14
Merge branch 'master' into CURA-6627_Store_extra_data_project_files 2020-01-21 15:14:45 +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
Nino van Hooff
1287ebdc51 Change backgroundColor and margin for licenseDialog 
CURA-7129
 2020-01-21 14:43:02 +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
Jaime van Kessel
06ccd882e1
Add missing typing 
CURA-6627
 2020-01-20 16:03:56 +01:00
Jaime van Kessel
52ce106399
Change _loadMetadata to be static 
CURA-6627
 2020-01-20 15:37:57 +01:00
Jaime van Kessel
bee641da5a
Remove local import of json 
CURA-7005
 2020-01-20 15:30:23 +01:00
Remco Burema
935c71edda
Fix name/file-location oops. 2020-01-17 17:25:00 +01:00
Remco Burema
fe2098376f
Prepare PostProcessingPlugin for security. 2020-01-17 17:15:37 +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
9dd50c8804 Replace buttons by PrimaryButtons for cloud sync dialogs 
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
Dimitriovski
ddd2afa08a
Added dummy image downloaded from internet for presentation only. 
CURA-7071
 2020-01-16 16:30:58 +01:00
Dimitriovski
51ec8a539f
Added a 'Marketplace' icon in the header of the Toolbox 
CURA-7071
 2020-01-16 16:30:11 +01:00
ninovanhooff
8bf7666493
Merge pull request #6986 from Ultimaker/CURA-7027_Add_more_materials_from_Marketplace_button 
Cura 7027 add more materials from marketplace button
 2020-01-16 16:26:38 +01:00
Nino van Hooff
59331666db Add missing cloud package manager 
CURA-6983
 2020-01-16 15:45:42 +01:00
Kostas Karmas
50fbe02c58 Add comment 
CURA-7027
 2020-01-16 15:19:51 +01:00
Kostas Karmas
18e5d76990 Fix button to open in-Cura Marketplace materials 
The button was opening the online Marketplace, which was wrong.
This fix changes the behavior to open the in-Cura Marketplace at
the materials tab.

In order to achieve that, the button calls an action called
materialsMarketplace, which in turn is connected through a
Connection in the ApplicationMenu. When the action is triggered,
it first launched the Toolbox and then it sets its category to
the materials tab.

Since the callExtensionMethod does not allow us to provide input
arguments to the called method, a new method had to be created in
the toolbox that changes the view to the materials tab, instead
of immediately calling the setViewCategory("material").

CURA-7027
 2020-01-16 15:11:34 +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
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
712cebcdd2
Let 3mf workspace reader read from files per plugin 
CURA-6627
 2020-01-16 11:43:07 +01:00
Jaime van Kessel
46050f9618
Use getter instead of protected attribute 
CURA-6627
 2020-01-16 11:25:30 +01:00
Jaime van Kessel
4e0e0c0339
Add skipkeys flag to writing plugin metadata to workspace 
CURA-6627
 2020-01-16 11:19:29 +01:00
Jaime van Kessel
b8dbc1d160
Store the data from each plugin in it's own folder 
CURA-6627
 2020-01-16 09:50:45 +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