29037 Commits

Author SHA1 Message Date
j.spijker@ultimaker.com
c04fdfef47 add jeepney as dependency on all platforms
Contributes to CURA-9365
2022-06-13 00:21:50 +02:00
j.spijker@ultimaker.com
891fc36658 Add secretstorage and keyring as requirements
Contributes to CURA-9365
2022-06-13 00:15:19 +02:00
j.spijker@ultimaker.com
17a5c45f1a Add jeepney as requirements for linux
Contributes to CURA-9365
2022-06-13 00:08:50 +02:00
j.spijker@ultimaker.com
8d7732353f Allow using lower case true, false options
Workaround for Github Actions passing a lowercase boolean as a string

Contributes to CURA-9365
2022-06-12 23:54:50 +02:00
j.spijker@ultimaker.com
2cab988c63 Manage deps with the conan_data
Contributes to CURA-9365
2022-06-12 20:18:41 +02:00
j.spijker@ultimaker.com
b318be171b Add pyserial as a requirement
Contributes to CURA-9365
2022-06-12 19:18:53 +02:00
Jelle Spijker
823e8f6347 Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-12 19:10:52 +02:00
j.spijker@ultimaker.com
5d740d7368 Set the CuraVersion with the conan options
Contributes to CURA-9365
2022-06-12 19:09:22 +02:00
j.spijker@ultimaker.com
e1c384cd92 Add a conanfile
This file should take care of downloading the C++ and Python binding
dependencies. It uses the PythonVirtualRunEnv to generate a Virtual
Python Environment, setting the Paths and installing the requirements
specified in the requirements.txt

Contributes to CURA-9365
2022-06-12 17:30:38 +02:00
j.spijker@ultimaker.com
8c6a5baf35 Define Cura Python requirements
Our requirements.txt was never fully utilized.
For our builds we use a requirements.txt
specified in the cura-build-enviroment repo.
But that file contained all the Python requirements
including, testing and dev tools.

This requirements.txt should contain the bare minimum
for running Python. Since these dependencies are shipped
we need to specify the hashes as well.

These hashes aren't necessary for build and test requirements

Contributes to CURA-9365
2022-06-12 17:24:30 +02:00
Jaime van Kessel
7397497260 Add quality_name and quality_changes_name to replacement patterns
CURA-9375
Fixes #12447
2022-06-10 16:00:23 +02:00
Jaime van Kessel
e57af7556c Remove incorrect maximum_value for bridge_skin_density
Whoops. That should have already been removed.

Fixes #12455
2022-06-10 13:54:03 +02:00
j.delarago
d5511a078c Dialog was immediately being destroyed because a reference to it was not being stored in memory. Added a missingPackageDialog variable to WorkspaceDialog to fix this.
Swapped the loading order of Marketplace extensions so SyncOrchestractor is not fetched by PluginRegistry.getInstance().getPluginObject("Marketplace") in WorkspaceDialog.

CURA-8610
2022-06-08 12:19:36 +02:00
j.delarago
25250a8205 Merge remote-tracking branch 'origin/main' 2022-06-08 11:52:01 +02:00
j.delarago
f9ea517e05 If package.json metadata file is missing from 3mf file output warning instead of error.
CURA-8610
2022-06-08 11:51:54 +02:00
Ghostkeeper
4a08b88f31
Allow setting metadata subentries that don't exist yet
Otherwise it crashes here. The ContainerManager should be flexible enough to allow that sort of thing.
It works with plain entries, but crashed with subentries (like 'properties/diameter') if those weren't present yet in the metadata.

Fixes Sentry issue CURA-3FH.
2022-06-08 11:24:46 +02:00
Ghostkeeper
0f12b012cf
Create InstallMissingPackageDialog with newly-exposed function from Marketplace
This adds a new function to the API of the Marketplace plug-in.
It's not pretty, but it's going to be how it is for a while.

Done to fix a critical build issue. The 'import plugins' thing works from source but not on the build.
2022-06-08 10:19:51 +02:00
Ghostkeeper
de8a58f0d7
Fix imports, especially not using plugins folder as module
When running from source, 'import plugins' works since it's working from the directory where the plug-ins directory is located. However in a build this doesn't work since the source code is in a different location there.
2022-06-08 09:50:44 +02:00
j.spijker@ultimaker.com
40990d686f Set cmake policies for MSVC flags
Although not used in this project.
This policy is needed by our cura-build-environment
because the conan_toolchain requires this to be set.
Since we use CMake for all our repo's even pure
Python or resource repos such as this, we need to
set in regardless.

Contributes to CURA-9365
2022-06-07 16:28:55 +02:00
Ghostkeeper
fb3f065fe0
Catch ValueErrors from removing callbacks that were already removed
This can happen from asynchronous access.

Fixes Sentry issue CURA-3YV.
2022-06-07 13:55:56 +02:00
j.delarago
efeb29c734 Fix call to plugin that was causing errors when building
CURA-8610
2022-06-07 13:41:54 +02:00
Remco Burema
d2381f129f
Merge pull request #12434 from Ultimaker/CURA-6990
Use "required packages" metadata to load a project file with a third party material
2022-06-07 13:26:31 +02:00
c.lamboo
76180eee01 Show warning on-close of the install missing packaged dialog
CURA-6990
2022-06-06 22:49:49 +02:00
c.lamboo
bee4da6368 Re-use Marketplace Component in the InstallMissingPackagesDialog
CURA-6990
2022-06-06 22:27:31 +02:00
c.lamboo
2f22002fd5 Add header and footer components to Dialog
This provides control over how the header (the header is newly introduced in this commit) and footer components are rendered. The footer is the area where the `leftButtoons` and `rightButtons` are rendered. Having control over how this is rendered introduces for instance the possibility to render the buttons within a warning area (an example of this can bee seen in the WorkspaceDialog).

CURA-6990
2022-06-06 21:45:48 +02:00
c.lamboo
781723fbbc Fix typing
CURA-6990
2022-06-06 21:27:32 +02:00
c.lamboo
34004df7af Un-capitalise materials
CURA-6990
2022-06-03 16:25:43 +02:00
c.lamboo
eccef62dc7 Add typing
CURA-6990
2022-06-03 15:22:29 +02:00
c.lamboo
2230269ab3 Simplify variable assignment
CURA-6990
2022-06-03 15:17:32 +02:00
c.lamboo
8d3b3ae411 Use themed border width
CURA-6990
2022-06-03 11:13:19 +02:00
c.lamboo
4492e3fba2 Add warning border to PackageCard if information is missing
CURA-6990
2022-06-03 10:39:01 +02:00
Ghostkeeper
979c436b6c
Make text area selection use theme colours
Also fix the highlight colour of the border. The highlight colour was changed in a later design but it was not changed here yet.
Without a theme colour it's going to use the system colours for the highlighting of text, which may be a very light grey that matches the background, making it impossible to see what part of the text is selected.

Hopefully fixes issue #12286.
2022-06-03 10:30:17 +02:00
c.lamboo
70c36fc80f Use correct status icon
CURA-6990
2022-06-03 10:13:29 +02:00
j.delarago
277a6a38b2 Update campaign link
CURA-6990
2022-06-02 17:40:14 +02:00
j.delarago
4c2be68c7b Add pyqtSignal no get rid of annoying errors
CURA-6990
2022-06-02 17:39:41 +02:00
j.delarago
a0fd5afbe7 Add missing warning badge
CURA-6990
2022-06-02 17:38:50 +02:00
c.lamboo
8fe53163b3 Add Action button and learn more link to warning message
CURA-6990
2022-06-02 17:33:56 +02:00
j.delarago
00cbee6985 Add missing continue, this was throwing errors due to it trying to packagedata.get("isbundled") on a None value.
CURA-8610
2022-06-02 17:08:25 +02:00
Jaime van Kessel
afd7f5507d
Merge pull request #12394 from Ultimaker/PP-15-enable-skin-edge-support
PP-15-enable-skin-edge-support
2022-06-02 17:06:53 +02:00
Jaime van Kessel
952da63230
Merge pull request #12415 from Ultimaker/PP-170-clean-up-retraction_count_max
Pp 170 clean up retraction limits
2022-06-02 17:05:57 +02:00
Rijk van Manen
3a7341f761
Disable travel acceleration/jerk
This slightly improves visual quality (mainly the seam) and reduces gcodes per second. PP-9
2022-06-02 17:02:22 +02:00
Rijk van Manen
a970e455d4
Merge branch 'main' into PP-15-enable-skin-edge-support 2022-06-02 17:01:29 +02:00
c.lamboo
a506b6d9ad Merge remote-tracking branch 'origin/CURA-6990' into CURA-6990 2022-06-02 16:58:51 +02:00
c.lamboo
fccfcb0e2b Add scroll bar to the WorkSpaceDialog
The warning message took out some space from the dialog. Added a scroll bar to make sure the content can still be read.

CURA-6990
2022-06-02 16:58:41 +02:00
j.delarago
511b10c084 Display package cards in the package list for packages that can't be found on the marketplace api.
When the final page of results is fetched, the list of all package_ids retrieved from the api will be compared with the ones we were searching for. Any that are missing have cards displayed with only basic information (name and version).

CURA-6990
2022-06-02 16:54:08 +02:00
Jaime van Kessel
95e078a3a9
Merge pull request #12356 from p3d-dev/main
deletion of duplicated json entries
2022-06-02 15:54:26 +02:00
Jaime van Kessel
b42a06fddd
Merge pull request #12418 from Ultimaker/PP-172-dont-avoid-supports
PP-172 disable travel_avoid_supports
2022-06-02 15:50:47 +02:00
Jaime van Kessel
2d1abf79a8
Merge pull request #12416 from Ultimaker/PP-46-print-infill-before-walls
revert PP-37
2022-06-02 15:48:44 +02:00
Jaime van Kessel
65e4b0e0d7
Merge pull request #12412 from Ultimaker/PP-19_also_increase_jerk_for_support
PP-19 - Also increase jerk for support
2022-06-02 15:48:12 +02:00
Jaime van Kessel
9fc3357818
Merge pull request #12398 from Ultimaker/PP-93-enable-top-surface-skin-layers
reduce top/bottom flow by enabling top surface skin layers
2022-06-02 15:45:53 +02:00