Commit graph

7047 commits

Author SHA1 Message Date
Joey de l'Arago
b132b5c08c
Update cura/Machines/Models/IntentSelectionModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:29:59 +02:00
Joey de l'Arago
e47a2d1c99
Update cura/Machines/Models/IntentSelectionModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:29:26 +02:00
Joey de l'Arago
b4152d29d6
Update cura/Machines/Models/ActiveIntentQualitiesModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:29:16 +02:00
Joey de l'Arago
87afb117d0
Update cura/Machines/Models/ActiveIntentQualitiesModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:28:22 +02:00
Joey de l'Arago
760976159c
Update cura/Machines/Models/ActiveIntentQualitiesModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:28:13 +02:00
Joey de l'Arago
caa0c255aa
Update cura/Machines/Models/ActiveIntentQualitiesModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:28:06 +02:00
j.delarago
d19e89325f Stop returning quality types from inactive quality groups. This was causing the resolution drop down to show unavailable resolutions.
CURA-8849
2022-06-15 09:06:00 +02:00
Ghostkeeper
bd131257fe
Implement sending a signal when changing intent changes quality level
For now it does nothing. But I'm adding a function that should cause the combobox to pulse. That'll be a new feature so I'm implementing it in a separate commit.

Contributes to issue CURA-8849.
2022-06-14 16:00:13 +02:00
Ghostkeeper
074e9a8607
Show profile group name in bold
That highlights it relative to the layer height.

Contributes to issue CURA-8849.
2022-06-14 15:36:29 +02:00
j.delarago
5cfb6f94e3 Update the resolution dropdown model whenever a custom profile is enabled. Otherwise it won't reflect the custom profiles parent resolution.
CURA-8849
2022-06-14 15:03:47 +02:00
j.delarago
a87695cd8d Added new intent selection buttons and resolution drop down to replace the matrix.
We are now selecting intents first and then quality, however the container hierarchy quality -> intents. This is the reason for the new functions inside machine manager.

CURA-8849
2022-06-14 11:41:38 +02:00
j.delarago
ed7ec6ab8f Add intent change signal so intent changes can trigger updates in resolution drop down.
CURA-8849
2022-06-14 09:59:22 +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
j.delarago
efeb29c734 Fix call to plugin that was causing errors when building
CURA-8610
2022-06-07 13:41:54 +02:00
Joey de l'Arago
16804dfeee
Merge pull request #12411 from Ultimaker/CURA-9297_show_custom_intent_names
Use intent category if no translation is available
2022-06-02 10:32:08 +02:00
Ghostkeeper
84e3201db4
Merge branch '5.0' 2022-06-01 15:38:37 +02:00
Jaime van Kessel
e6551821aa Use intent category if no translation is available
Previously we would only accept intents that had a translation. If we
could not find one, we would use "unknown" as the intent category. However,
we didn't really do this consistently. In some places it would show unkown
and in others we'd show the intent type.

This should make the behavior the same across the board. It will try to get a
translation for the intent category and show that. If it's unable to find that
it will use the category instead. Note that it will use the python title function
to ensure it has nice capitalisation

CURA-9297
2022-06-01 11:07:01 +02:00
Remco Burema
6640c5e5f2
Merge pull request #12402 from Ultimaker/CURA-8610_save_package_metadata
[CURA-8610] Save package metadata
2022-05-31 17:21:20 +02:00
j.delarago
29b6450704 Add some more information for the unhappy route and a message to inform the user.
CURA-6990
2022-05-31 16:30:11 +02:00
Ghostkeeper
d6bd7cce9e
Oops 2022-05-31 13:39:47 +02:00
Remco Burema
6b04c736e9 Revert "Disable the material sync message again"
This reverts commit 1f6e1942d7.
2022-05-31 12:34:55 +02:00
Ghostkeeper
35147d7f5e
Don't crash if machine_extruder_trains metadata is missing
This old function is only necessary for upgrading from before v3.4. Best not let it crash in any other case, even if that would sometimes make very old machine instances corrupt if I made a mistake in thinking here.

Fixes Sentry issue CURA-3XG.
2022-05-31 11:24:08 +02:00
j.delarago
cdc08b5d54 Improve GUID check by parsing xml and getting GUID specifically inside the metadata tag.
Remove exporting materials from disabled extruders

CURA-8610
2022-05-31 10:00:25 +02:00
j.delarago
3dec025cb8 Update comment to clarify function usage.
CURA-8610
2022-05-31 08:54:08 +02:00
j.delarago
21d59e9349 Write active material metadata to ufp when saving.
Add function to fetch package_id using only information from XmlMaterialProfile material container.
The only piece of information associating the material container and the package together is the file_name. To find the package that owns a material we have to search each of the material package paths.

It would be great to find a cleaner solution (preferable one that doesn't require invalidating the cached containers).

CURA-8610
2022-05-30 17:29:59 +02:00
j.delarago
be25029aca This fix will stop enterprise versions from searching the user config folder for non storage type resources.
Refer to SEC-253 for more information

SEC-253
2022-05-24 13:10:08 +02:00
Ghostkeeper
1af2a75138
Also send short OpenGL version
This is the one we're more likely to be interested in.

Done as a 5 minute fix.
2022-05-23 11:54:53 +02:00
Ghostkeeper
0cb2b3e2cb
Fix translation containing HTML tags
Let's not confuse the translators by requiring to translate these in the future.

Done as a 5 minute fix.
2022-05-23 11:54:26 +02:00
Remco Burema
050a731663 In secure version: disable loading themes from unbundled folders.
This was a bit more tricky then it at first seemed, since the information wether this is a 'secure version' comes from the user-application and is not known in the Uranium library. This is not normally such a point, but both the theme and the preferences objects are loaded _very_ early in the process, and that information needs to be injected before then. (Well, in the case of the Theme object it's less important, since in the implementation choseen that is now security wise at least only in charge of wheter or not to even show the theme as selectable in the interface, so that it only needs to be aware of the 'security' status any time before the user can see a preference screen, but not nescesarily earlier.)

SEC-255 | CURA-8966
2022-05-20 14:32:28 +02:00
Ghostkeeper
4fd0d34b1c
Remove extra resource path from Python file
This was recently added. However it appears that we have the same path multiple times in the resources, leading to the resources being found twice. This would normally get removed by virtue of being a set, but not this time since it's a different way of writing the same path.
For the themes, it finds the following paths (in my unpacked directory): {'/home/trin/tempy/cura5/UM/../share/uranium/resources/themes', '/home/trin/tempy/cura5/cura/../share/cura/resources/themes', '/home/trin/tempy/cura5/share/cura/resources/themes', '/home/trin/.local/share/cura/5.0/themes', '/home/trin/tempy/cura5/share/uranium/resources/themes'} For both Cura and Uranium, this points to /home/trin/tempy/cura5/curanium/resources/themes twice. So let's remove this one.

Contributes to issue CURA-9147.
2022-05-10 18:10:32 +02:00
Jelle Spijker
334fca6691
Merge remote-tracking branch 'origin/gracefully_fail_cloud_printer' into 5.0 2022-05-09 10:54:07 +02:00
Casper Lamboo
d79921c964
Merge pull request #12114 from Ultimaker/CURA-9141_translate_5.0
Cura 9141 translate 5.0
2022-05-06 13:50:30 +02:00
j.delarago
ba3913395c Add catalog to files that weren't translating
CURA-9141
2022-05-05 16:42:01 +02:00
Jaime van Kessel
509b7d65d5 Fix error checking never setting state to "hasError"
CURA-9249

Fixes #12082
2022-05-05 13:39:30 +02:00
Jaime van Kessel
0c98ce2384 Use correct role for standardbutton
Otherwise the no won't register...

CURA-9229
2022-05-04 11:09:49 +02:00
Remco Burema
a2d721b6ac Always return int's.
The problem was probably 'max', but cast the others just to be sure. (This would cause the C++ part of Qt to think it wasbeing given a float from Pyton somehow.)

should fix CURA-9196
2022-04-26 16:54:46 +02:00
Jaime van Kessel
c1ed7b97f9 Use right enums for single instance
CURA-9183
2022-04-22 09:36:46 +02:00
Jelle Spijker
16d0a81911 Merge remote-tracking branch 'origin/fix_wait_for_first_slice' into 5.0 2022-04-21 09:26:48 +02:00
Remco Burema
0232b4f639 Upgrade SDK version to 8.0.0 for Cura 5.0 2022-04-20 10:57:38 +02:00
Jaime van Kessel
ffa0106937 Check multiple settings per update of event loop
It seems that in Qt5, the update loop was triggered a lot more often than in qt6.
Since we used that to handle the error checking, this made it so that you sometimes had to wait
for quite some time untill the slicing would start (as that is blocked by the error checker)
2022-04-19 17:00:06 +02:00
Jaime van Kessel
e4e993a44e Fail gracefully when adding unknown cloud printer 2022-04-19 15:43:31 +02:00
Remco Burema
5a43e5945c Fix Cura not closing properly on Windows.
May be a bit crude, but simple and readable, and we're supposed to have handled everything anyway at the point the event comes in.

CURA-9155
2022-04-19 14:28:41 +02:00
j.spijker@ultimaker.com
52a6da2d8f
Use minus sign for extra version info
Contributes to CURA-8640
2022-04-14 10:01:37 +02:00
j.spijker@ultimaker.com
aef483018c
Fix version on splash screen
Contributes to CURA-8640
2022-04-14 09:38:42 +02:00
Jaime van Kessel
50954552d2 Fix thumbnail creation
CURA-9120
2022-04-13 16:53:11 +02:00
Jaime van Kessel
204eeaf272 Add extra warnings if it failed to create snapshot
CURA-9120
2022-04-13 16:47:07 +02:00
Jaime van Kessel
c9e625767b Use right enum for message dialog 2022-04-13 16:40:14 +02:00
Jaime van Kessel
111d335743 Give text more room on splashscreen
CURA-9151
2022-04-13 16:36:23 +02:00
Ghostkeeper
d1d45b4f41
Fix enum to FormDataType
Stupid enum change...

Contributes to issue CURA-9119.
2022-04-11 13:23:03 +02:00
Jelle Spijker
fb22a04d4d Add search path for the pyinstaller locations
Contributes to CURA-8640
2022-04-08 20:34:42 +02:00