9102 Commits

Author SHA1 Message Date
c.lamboo
0afab9f9e9 Add label-string to translations 2022-07-18 10:40:41 +02:00
Jelle Spijker
1a0ecfd850
Merge branch '5.1'
# Conflicts:
#	.github/workflows/conan-package.yml
#	.github/workflows/cura-installer.yml
2022-07-14 16:30:52 +02:00
Evangelos Trantos
96c4e15c03
Merge pull request #12746 from Ultimaker/CURA-9465_dark_theme_issues
Fix multiple dark theme issues
2022-07-14 09:34:58 +02:00
Ghostkeeper
107d12856d
Remove fill colours from this icon
Otherwise the theme won't have any effect on it since 5.0.

Done as a 5 minute fix.
2022-07-13 17:35:19 +02:00
Jaime van Kessel
0fac778601
Fix postprocessing settings being too dark
In dark theme you couldn't really read them.

CURA-9465
2022-07-12 10:06:39 +02:00
jspijker
f9d4628b95 Merge branch 'main' into CURA-9365
# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/cura-installer.yml
#	.github/workflows/requirements-conan-package.txt
#	resources/definitions/Mark2_for_Ultimaker2.def.json
#	resources/definitions/elegoo_neptune_2.def.json
#	resources/definitions/elegoo_neptune_2D.def.json
2022-07-08 12:37:32 +02:00
Ghostkeeper
15c1b96d7b
Fix crash if a Digital Library project is made by deleted user
If the user that created a project has been deleted, the response from the API doesn't include a username. This crashes Cura because it had no default for the username.
The organization_shared field was also optional.

Done as a small fry to fix a bug found by a colleague.
2022-07-07 15:04:15 +02:00
Remco Burema
3dc646874d
Merge pull request #12634 from Ultimaker/CURA-9402_fix_background_dark_theme
Fix background dark theme
2022-07-01 14:30:10 +02:00
Remco Burema
ca36b4f2ef Set proper background color for open project dialogs.
part of CURA-9402
2022-07-01 14:22:27 +02:00
Jaime van Kessel
12379b15cd Use correct key for serialized setting to keep
'recommend cleaning after n prints' instead of 'recommended cleaning after n prints'

CURA-9432
2022-06-30 16:37:26 +02:00
Remco Burema
fab86be909 Keep settings throughout reserilization process.
Save some settings Cura doesn't use, but other consumers of the file might in the metadata during deserilization, so they can be properly re-serialized whenever exported.

part of CURA-9432
2022-06-30 14:14:11 +02:00
Ghostkeeper
795814d50b
Store unmapped settings in a separate set
We don't want to create actual settings for all of these. Just store them in the profile metadata and restore them.
Serialising and deserialising these is a bit more work than what I could do now in 5 minutes so we'll have to do that a bit later, but at least for now we have the complete list.

Contributes to issue CURA-9432.
2022-06-30 09:45:45 +02:00
Jaime van Kessel
ddb87656ff Add two recently introduced material settings
CURA-9432
2022-06-29 16:24:51 +02:00
Jaime van Kessel
91cd709b46 Properly set background for postprocessing plugin
CURA-9402
2022-06-29 10:56:08 +02:00
Ghostkeeper
adeb9da356
Merge branch '5.1' 2022-06-28 17:53:24 +02:00
Remco Burema
c4422b87f9
Merge pull request #12599 from Ultimaker/CURA-9414
Don't show scary error message when saving custom file
2022-06-28 13:07:21 +02:00
Remco Burema
1872e54842 Message might be good for debugging.
Maybe at some point someone will ask wjy they don't get a message.

part of CURA-9414
2022-06-28 13:06:59 +02:00
Ghostkeeper
96192adce2
Catch wrong cloud responses when it responds with a new file name
It could happen if there are bugs in the cloud, e.g. if they strip special characters somewhere.
We'd want to know it if they do. But we also don't want Cura to crash if the remote connection is not reliable, or if there's changes/bugs in the future.

Fixes Sentry issue CURA-42F.
2022-06-27 11:30:38 +02:00
c.lamboo
2c074fb7a3 Don't show scary error message when saving custom file
CURA-9414
2022-06-24 14:52:42 +02:00
j.delarago
9aaf59ae86 Suggested changes
CURA-9412
2022-06-24 14:29:50 +02:00
j.delarago
dd3abf7ff0 Add check for empty material instance containers before trying to fetch material metadata. This fixes failing to save a project on a printer with no materials (UM2 for example).
CURA-9412
2022-06-22 14:05:56 +02:00
Ghostkeeper
ac67dcc045
Don't cache PluginRegistry instance
Several reasons:
* It's bad style, making it harder to test with mocked PluginRegistry since all sorts of objects have copies of the un-mocked object in their fields.
* It's causing errors in this case when checkIfRestartNeeded is called before show().

Fixes Sentry issue CURA-3P6.
2022-06-22 11:52:13 +02:00
Ghostkeeper
8970f46154
Better path to packages.json in the 3MF file
Let's put it in the Cura directory with the rest of such files, as to not muddy the 3MF file with all sorts of directories that are not known to other consumers.

Contributes to issue CURA-9413.
2022-06-20 11:04:14 +02:00
Ghostkeeper
d1747e09e1
Fix link to help page when material package is missing
In this case we don't want to link to Ultimaker's internal help pages, but to the public support pages.
2022-06-20 10:48:13 +02:00
Jaime van Kessel
b25e760c53 Remove incorrect enum usage
This only needs to happen in code that uses PyQt, not in qml code
2022-06-17 15:26:30 +02:00
Jaime van Kessel
ac32f3b625
Merge pull request #12530 from Ultimaker/CURA-8610_save_required_packages_metadata
[CURA-8610] save required packages metadata
2022-06-16 10:47:06 +02:00
j.delarago
8c2ac9f21e Remove excessive logs, make path search recursive for materials.
CURA-8610
2022-06-15 15:47:17 +02:00
Remco Burema
188b63703b
Merge pull request #12531 from Ultimaker/CURA-8555_link_ufp_to_3mf_in_digital_library
Cura 8555 link ufp to 3mf in digital library
2022-06-15 15:16:11 +02:00
Ghostkeeper
20607b219a
Merge branch 'split-removable-output-write-function' of https://github.com/zxc8027/Cura into zxc8027-split-removable-output-write-function 2022-06-15 14:37:39 +02:00
j.delarago
4e80d170d1 Add logs for debugging
CURA-8610
2022-06-15 14:09:05 +02:00
c.lamboo
854607a725 Provide source_file_id with print file
Had to implement this a bit differently as stated in the ticket. This field is returned when uploading the project file.

Logic needed a bit of a change as the new behavior dictates a sequence (we can only upload the print file after the project file is uploaded, and we know the correct `file_id`/`source_file_id`) where before these two api calls were done in parallel.

CURA-8555
2022-06-15 13:36:34 +02:00
c.lamboo
f67d086182 Boyscouting modern python typing
CURA-8555
2022-06-15 13:27:47 +02:00
c.lamboo
a7fcc15197 Re-enable regular expression
CURA-8555
2022-06-14 16:49:40 +02:00
c.lamboo
0d4c3fa34d Use modern python typing notation
CURA-8555
2022-06-14 16:20:38 +02:00
c.lamboo
a315171d7c Replace checkboxes in save project to DL dialog with a combobox
CURA-8555
2022-06-14 16:19:56 +02:00
Jaime van Kessel
90bb02acae
Merge pull request #12485 from 4DPrinters/patch-1
Update PauseAtHeight.py
2022-06-13 15:50:54 +02:00
Jaime van Kessel
525f96db98 Merge branch 'CURA-8610_add_package_metadata' of github.com:Ultimaker/Cura 2022-06-13 13:22:03 +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
4DPrinters
98ed17d2df
Update PauseAtHeight.py
Corrected typo on line 333
2022-06-09 14:34:28 -05: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
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
j.delarago
71a817697b Before this change packages were only being checked if they were bundled after loading the package_id. However only installed packages were being loaded so this would always be false.
The solution here is to check first if a material file is inside "secure_paths" (these are install directory resource paths). If it is, it must be a bundled material.

CURA-8610
2022-06-08 10:22:24 +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
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
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