7628 Commits

Author SHA1 Message Date
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
Jelle Spijker
4abdd675f6
Merge branch 'master' into qt6_beyond_the_splash 2022-04-08 10:26:12 +02:00
Jaime van Kessel
efc5438090 Remove unneeded clear 2022-04-08 09:16:22 +02:00
Jaime van Kessel
9e4798c98b Set ownership of MaterialBrandsModel to cpp
This hopefully prevents the crash for MacOS
2022-04-07 20:10:58 +02:00
Jaime van Kessel
262520f193 Remove setting parent from basematerial 2022-04-07 18:05:27 +02:00
Ghostkeeper
855eaec81c
Scale convex hull only by X/Y shrinkage, and handle 0% gracefully
Only the X/Y shrinkage influences the convex hull collision area. Not the Z, nor the parent setting.

Also, don't scale the collision area to 0. This value is not allowed by the setting system, so it'd indicate an error when slicing, but before slicing the convex hull gets calculated which results in degenerate polygons. Don't do that. Instead, we'll just let it pretend the scale factor is 1.

Contributes to issue CURA-9091.
2022-04-07 14:17:56 +02:00
j.delarago
b2b1961b57 Merge branch 'master' into qt6_beyond_the_splash
# Conflicts:
#	cura/PrinterOutput/PrinterOutputDevice.py
2022-04-06 15:24:30 +02:00
p.kuiper
0a8ef5162e Removed the rather hacky implementation of the shrinkage factor averaging. Issues with dual extrusion were the second extruder is not used should solved in a different way.
Relates to PP-77
2022-04-06 13:28:55 +02:00
j.delarago
aa190024d4 Update enum, this fixes connecting to printers
CURA-8640
2022-04-05 16:01:17 +02:00
Jaime van Kessel
402c53c5f1 Fix warning about Duration 2022-04-01 16:19:35 +02:00
p.kuiper
733447a2dd Removed the settings: "material_shrinkage_percentage" and update code that was using this parameter.
material_shrinkage_percentage_xy and material_shrinkage_percentage_z cannot depend on material_shrinkage_percentage otherwise their resolve function will not execute properly.
I noticed that the shrinkage factors do not get the correct value if a wrong nozzle is chosen for a material. However, in that case the slicer will also not slice, so in practice this is not an issue

Relates to PP-77
2022-04-01 13:00:41 +02:00
Jaime van Kessel
124602d2ad Return account widget to it's former glory 2022-03-31 14:19:41 +02:00
Jaime van Kessel
b4b7e6a2b9 Fix warnings that "instanceContainer" is not a recognised type 2022-03-31 14:03:04 +02:00
Jaime van Kessel
96444dbc09 Use correct keyboard enums 2022-03-31 13:54:24 +02:00
Jaime van Kessel
820734aad7 Merge branch 'CURA-8466_version_upgrade_50' of github.com:Ultimaker/Cura 2022-03-30 10:52:07 +02:00
Jaime van Kessel
42b97d0d73 Prevent crash on setConnectionState when no global stack is set 2022-03-30 09:46:17 +02:00
Ghostkeeper
d9d90ab4b6
Increment setting_version to 20
We've removed a bunch of settings and transformed others. To allow profiles to be checked for these and edited if necessary, we now need to increment this version number.

Contributes to issue CURA-8466.
2022-03-29 15:03:48 +02:00
Jelle Spijker
12ee57e4ad
Merge branch 'master' into CURA-8640_PyQt6
# Conflicts:
#	cura/UI/CuraSplashScreen.py
2022-03-28 15:02:18 +02:00
Joey de l'Arago
b3eb5270f9
Merge pull request #11706 from Ultimaker/CURA-7810_remove_deprecated_functions
Remove deprecated functions
2022-03-25 14:42:20 +00:00
Jaime van Kessel
894615914a Merge branch 'new-splashscreen' of github.com:Ultimaker/Cura 2022-03-25 10:49:16 +01:00
Jaime van Kessel
1532779d1b Remove Extruders property from global stack
CURA-7810
2022-03-24 14:26:03 +01:00
Jaime van Kessel
74eac8f4b9 Remove printeroutput model
CURA-7810
2022-03-24 13:41:10 +01:00
Jaime van Kessel
e925f07aad Remove old arranger code
Major vesion upgrade, time to clean some stuff up!

CURA-7810
2022-03-24 13:37:29 +01:00
Jaime van Kessel
4d02894582 Remove cura.PrinterOutputDevice
Since we are moving up a major version, time to clean up deprecation warnings

CURA-7810
2022-03-24 13:27:27 +01:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
2022-03-24 11:53:44 +01:00
Jaime van Kessel
fa1554a62e Merge branch 'fix_disallowed_brim_gap_distance' of github.com:Ultimaker/Cura 2022-03-22 15:23:32 +01:00
Tim Kuipers
6da67e3d82 remove special case for prime tower brim disallowed area
It's now handled in CuraEngine
2022-03-17 14:41:57 +01:00