28744 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ghostkeeper	1e1b4f3dac	Merge pull request #11792 from Ultimaker/qt6_beyond_the_splash ... Cura 8640 PyQt6 upgrade	2022-04-14 14:52:32 +02:00
Jelle Spijker	981df9f928	Update resources/qml/TableView.qml ... Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>	2022-04-14 14:49:42 +02:00
Jelle Spijker	02a2d9c012	Update plugins/ModelChecker/ModelChecker.qml ... Looks like a left over Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>	2022-04-14 14:49:35 +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
Jelle Spijker	b3cd1fee09	Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash	2022-04-14 08:32:53 +02:00
Jaime van Kessel	25839c6d97	Fix direction of pointing rectangle ... Turns out that using anchors doesn't quite work anymore due to qt6 upgrade. Oh well! CURA-9137	2022-04-13 17:36:47 +02:00
Jaime van Kessel	ddb3ed1693	Fix crash in image reader and ensure it actually works ... CURA-9125	2022-04-13 16:58:37 +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
Jaime van Kessel	a6db27dd55	Prevent tootltip from showing during "processing" of slice button ... CURA-9150	2022-04-13 16:29:25 +02:00
Jaime van Kessel	dd037fa946	Make "create new" button visible ... CURA-9126	2022-04-13 16:25:24 +02:00
j.spijker@ultimaker.com	cb9b5961c3	Removed last remnants of RecolorImage ... This was still being used in the MaterialBrandsMenu and the SimpleButton Probably why the X es were missing from the info messages. CURA-9110 Contributes to CURA-8640	2022-04-13 12:40:54 +02:00
Remco Burema	ef591713e8	Update translation templates for 5.0. ... part of CURA-9141	2022-04-13 11:33:44 +02:00
Ghostkeeper	6f83927ec3	Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash	2022-04-12 14:11:36 +02:00
j.delarago	3674af01b7	selectExisting is replaced with using fileMode:FileDialog.OpenFile in QT6. This forces selecting an existing file. ... This is also the default value in QT6 so this line can be removed without changing the functionality	2022-04-12 10:21:34 +02:00
j.delarago	94e5a4e1db	Masking is not avaliable after the QT6 upgrade, this does a kind of primitive masking by placing a rectangle with a circular hole in it over the image. ... CURA-9104	2022-04-11 14:10:27 +02:00
Ghostkeeper	d1d45b4f41	Fix enum to FormDataType ... Stupid enum change... Contributes to issue CURA-9119.	2022-04-11 13:23:03 +02:00
Ghostkeeper	70fdffb1c9	Allow redirects when talking with printer API ... Because newer firmware will redirect this API call. Contributes to issue CURA-9119.	2022-04-11 13:23:03 +02:00
Jaime van Kessel	5bec905cb9	Remove fill from multiple SVG's	2022-04-11 11:40:04 +02:00
j.delarago	e076779293	Remove fill from Check.svg which was overriding attempts to recolor image. ... CURA-9101	2022-04-11 10:56:17 +02:00
Jaime van Kessel	279719099d	Also remove fill from default extruderCOlor icon	2022-04-11 10:39:48 +02:00
Jaime van Kessel	17e7c263df	Remove fill from extruderColor icon	2022-04-11 10:37:15 +02:00
Ghostkeeper	0deac84ec2	NetworkError is an enum, no longer comparable as int ... With the Qt6 upgrade, we have to treat enums as full enums, within their normal class namespace and such. They are no longer just integer-globals static in the QtCore.Qt class. They are no longer treated as integers by PyQt. Other places that checked for such errors were already doing it like this. Contributes to issue CURA-9100.	2022-04-11 10:00:32 +02:00
j.delarago	c4baece3ac	Remove reference to nonexistent property source size in UM.ColorImage which was causing add printer page to be empty ... CURA-9098	2022-04-11 09:52:33 +02:00
Jelle Spijker	fb22a04d4d	Add search path for the pyinstaller locations ... Contributes to CURA-8640	2022-04-08 20:34:42 +02:00
Ghostkeeper	90a3b4cde6	Use 250ms delay everywhere ... This looks like it's consistent with the normal menus. And it fixes the issue where multiple menus can be shown at once because it would hide slower than show the next one. Contributes to issue CURA-8640.	2022-04-08 17:02:52 +02:00
Ghostkeeper	af33073b29	Properly limit width of text in subsubmenu ... Getting rid of the layout makes a lot of things simpler here. Contributes to issue CURA-8640.	2022-04-08 17:02:52 +02:00
j.delarago	d46679c19f	Fix popups closing on selecting a material bug ... CURA-8640	2022-04-08 16:44:13 +02:00
Ghostkeeper	e7de7bb3cc	Add a checkmark to indicate the selected material ... As it used to have. Contributes to issue CURA-8640.	2022-04-08 16:35:54 +02:00
Ghostkeeper	5a76cd1615	Select material from menu when user clicks on it ... The main function of the menu, after all. Contributes to issue CURA-8640.	2022-04-08 16:35:54 +02:00
j.delarago	5df5d6c37d	Fix popup alignment ... CURA-8640	2022-04-08 16:34:59 +02:00
j.delarago	938ff691c4	Add arrows in submenus ... CURA-8640	2022-04-08 16:29:24 +02:00
Jaime van Kessel	d94ef39cba	Fix warnings for extruder icon	2022-04-08 16:08:24 +02:00
Ghostkeeper	7aafd95429	Implement sub-submenus for material selection ... Getting a bit complex with the timers there and which pop-ups need to stay open. But it seems to be working reliably now. Contributes to issue CURA-8640.	2022-04-08 15:57:42 +02:00
Ghostkeeper	b40900e146	Fix layout of subitems ... Contributes to issue CURA-8640.	2022-04-08 15:57:42 +02:00
c.lamboo	45bc498c7f	Replace RecolorImage with ColorImage ... CURA-8640	2022-04-08 15:55:34 +02:00
Ghostkeeper	3de824e1a4	Show submenu with material types ... It's quite a hassle to get it to keep displaying... Contributes to issue CURA-8640.	2022-04-08 14:58:39 +02:00
Ghostkeeper	11b557b3d9	Replace material sub-menus with custom Popup ... The sub-menus were giving segfaults for some reason. We couldn't figure out how to circumvent that. So now we're at a last resort: Implement the whole thing ourselves, but with Popup instead of Menu. Contributes to issue CURA-8640.	2022-04-08 11:57:19 +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
Casper Lamboo	dec359da1d	Merge pull request #11641 from Ultimaker/PP-129_increase-filter-distance ... increase filter distance	2022-04-07 13:59:56 +02:00
Casper Lamboo	c4748ba332	Merge branch 'master' into PP-129_increase-filter-distance	2022-04-07 13:54:27 +02:00
Casper Lamboo	00fcd9d006	Merge pull request #11725 from Ultimaker/feat_transition_filter_limit ... Feat/Fix: transition filter limit	2022-04-07 13:52:29 +02:00
Jelle Spijker	455c163b60	Merge branch 'master' into qt6_beyond_the_splash	2022-04-07 12:01:17 +02:00