135 Commits

Author SHA1 Message Date
Jaime van Kessel
a52f866f81 Move most models out of dictionary
CURA-6006
2018-12-05 14:03:32 +01:00
Jaime van Kessel
07d210483c Greatly decrease the bloat / complexity of the toolbox
There was a lot of stuff going on that didn't need to happen, so I cut those parts out in order
to improve the overview.
2018-12-05 13:42:13 +01:00
Jaime van Kessel
b1440737e6 Remove a whole bunch of unused code
CURA-6006
2018-12-05 13:21:17 +01:00
Jaime van Kessel
d9135ac72f Fix more codestyle issues
CURA-6006
2018-12-05 11:06:14 +01:00
Jaime van Kessel
978a01e4c8 Fix typing & codestyle
CURA-6006
2018-12-05 10:51:05 +01:00
Jaime van Kessel
700ae4bebb Removed super spammy logging
CURA-6006
2018-12-05 10:48:06 +01:00
Ghostkeeper
e9216936d7
Compare SDK version as Version instances
This allows it to compare versions that are remote as integer and local as string, or vice-versa. Much more robust.

Contributes to issue CURA-5940.
2018-11-15 15:20:21 +01:00
Ghostkeeper
78e6494430
Read SDK version from new semver field
The sdk_version field should stay the ordinary plain number (the major version number of the semver field) so that older Cura versions don't break. Newly built packages will get built with both sdk_version_semver and the normal sdk_version, so that the packages can be read with any Cura version from 3.6 onwards.

Contributes to issue CURA-5940.
2018-11-15 15:13:36 +01:00
Remco Burema
5f4e3948d3 Merge branch 'master' into CURA-5840-make-plugin-sdk-use-semantic-versioning 2018-11-13 13:16:22 +01:00
Ghostkeeper
7f54cacd0f
Code style
Discovered during work on CURA-5840.
2018-11-09 14:11:38 +01:00
Lipu Fei
75f2f40534 Make API version configuration for Application
CURA-5840
2018-11-08 12:04:43 +01:00
Jaime van Kessel
9a93f6866a Fix crash of toolbox when metadata got corrupted 2018-11-07 12:03:32 +01:00
Jaime van Kessel
44954c4cad Fixes required for semantic versioning
CURA-5840
2018-11-01 14:15:16 +01:00
Remco Burema
5cb72e298d
Merge pull request #4700 from Ultimaker/CURA-5873_fix_duplicated_generic_materials
Fix duplicated generic materials
2018-10-31 11:47:09 +01:00
Diego Prado Gesto
3e37f2a09d Reset the list of generic materials to emtpy when creating the models.
Contributes to CURA-5873.
2018-10-31 10:31:20 +01:00
Diego Prado Gesto
33da50df26 Rename other entries of the Toolbox to Marketplace.
Add a line in the Changelog indicating that the Toolbox was renamed.

Contributes to CURA-5874.
2018-10-31 09:45:29 +01:00
Diego Prado Gesto
77fd05ac70 Disable other buttons while toolbox is downloading to avoid crashes.
I did it that way to not be risky because we're close to the release.

Contributes to CURA-5778.
2018-10-01 17:21:34 +02:00
Lipu Fei
a33ce8178a Support mulitple bundled_packages JSON files
CURA-5718
2018-09-18 15:53:56 +02:00
Lipu Fei
da047ea674 isInstalled() should check old plugins as a fallback 2018-09-17 17:26:38 +02:00
Lipu Fei
15657f4cfc Remove unneeded code 2018-09-17 17:26:19 +02:00
Lipu Fei
4db213c55a Fix missing import 2018-09-17 16:24:10 +02:00
Lipu Fei
a4b20e046d Merge remote-tracking branch 'origin/3.5' into CURA-5718_fix_upgrade_for_bundled_plugins 2018-09-17 16:22:22 +02:00
Lipu Fei
6d1db55072 Fix SDK version comparison 2018-09-17 16:14:28 +02:00
Lipu Fei
3ac5a316d3 Check package upgradable using PM first, old plugins later
CURA-5718

For package upgradable, we need to check if a package is installed
local. For that, we first check in the package manager, if nothing, then
we fall back to check the old plugins.
2018-09-17 12:05:10 +02:00
Lipu Fei
1064d837ed Exclude bundled plugins in the old plugins list 2018-09-17 12:05:10 +02:00
Jaime van Kessel
4c460b6fa5 Prevent crash if sdk_version is "dev" 2018-09-14 16:15:56 +02:00
Lipu Fei
b39d6c7d87 Package upgrade should also check SDK version 2018-09-13 13:42:53 +02:00
Lipu Fei
d1301d16a9 Skip the do-not-handle URLs instead of returning
CURA-5718

The request-url dict is not ordered so you cannot garuantee the ordering
when you use .items(). This can cause a problem that if a do-not-handle
item occurs first then nothing will be handled at all.
2018-09-12 16:58:22 +02:00
Diego Prado Gesto
e3681ddd9f Also hack the way to get the generic materials, since the tag-filtered
calls to the api don't work yet.

Contributes to CURA-5670.
2018-09-11 13:39:53 +02:00
Jaime van Kessel
301605c30c Added missing typing to toolbox 2018-09-11 13:20:42 +02:00
Diego Prado Gesto
b638b2274a Count only the material packages by author, not all packages.
Contributes to CURA-5670.
2018-09-03 15:12:52 +02:00
Diego Prado Gesto
bf1d3b964f Skip loading a reply if it's not later handled.
Contributes to CURA-5670.
2018-09-03 14:30:05 +02:00
Ian Paschal
988b9059b9 Fix code-style
Contributes to CURA-5670
2018-08-31 16:55:03 +02:00
Ian Paschal
dec76a19ed Build models using reserved tags
Contributes to CURA-5670
2018-08-31 16:13:01 +02:00
Lipu Fei
1bacdabf35 Minor refactor 2018-08-03 14:42:34 +02:00
Ian Paschal
8268419eda Remove debug print()
Contributes to CURA-5604
2018-08-03 14:31:30 +02:00
Ian Paschal
2a6da9fe8e Only show material packages when clicking an author
Contributes to CURA-5604
2018-08-03 14:28:45 +02:00
Ian Paschal
0bde1487e7 Add generic material packages to materials page
Contributes to CURA-5510
2018-07-16 16:13:43 +02:00
Diego Prado Gesto
af697c6999 CURA-5536 The api call does not return the package_count for the showcase, so we can't trust in that value. The total number of material packages by author is now calculated. 2018-07-13 15:13:38 +02:00
Diego Prado Gesto
96cc1be2ff CURA-5536 Calculate the number of installed packages by author. 2018-07-13 13:20:56 +02:00
Jack Ha
2bd8350141 Added error checking, added typing, renamed function. CURA-5389 2018-07-12 14:06:34 +02:00
Lipu Fei
76417b7fb2 Hide materials belong to a to-be-removed package 2018-07-11 10:57:57 +02:00
Lipu Fei
328fd9081e Merge remote-tracking branch 'origin/master' into remove-package-check 2018-07-10 14:57:46 +02:00
Lipu Fei
cc5f35dd91 Rename some functions and variables 2018-07-10 14:57:01 +02:00
Ian Paschal
ac0192f01f Improve fixes 2018-07-09 11:29:25 +02:00
Jack Ha
bff9a3afb5 Merge branch 'master' into remove-package-check 2018-07-09 11:25:19 +02:00
Jack Ha
5af5aa9e35 Added reset profiles/materials and uninstall functionality and dialog. CURA-5389 2018-07-09 09:57:31 +02:00
Ian Paschal
75d5828f5f
Merge branch 'master' into fix_tests_cura_engine_backend 2018-07-06 09:48:07 +02:00
Ian Paschal
85be9cea07 Fixes for Toolbox 2018-07-05 16:06:37 +02:00
Diego Prado Gesto
c738f306fb Fix style in some components 2018-07-05 14:35:12 +02:00