5893 commits

Author	SHA1	Message	Date
Kostas Karmas	cf6540f91d	Fix qualities lookup for custom materials ... Search the qualities of the custom material based on the base_file and not based on the id. CURA-7070	2019-12-18 16:44:19 +01:00
Lipu Fei	6c9b8f992f	Fix quality search with material base_file ... CURA-7070	2019-12-18 15:39:17 +01:00
Lipu Fei	4b313c2dac	Fix formatting ... CURA-7070	2019-12-18 15:38:23 +01:00
Kostas Karmas	50b8ff2352	Fix check that finds the extruder in a position ... CURA-7048	2019-12-17 10:55:28 +01:00
Kostas Karmas	a1d7eefc42	Fix PPA crashing on single-extruder printers ... The machine manager was leading to a crash when trying to enable the second extruder in single-extrusion printers, because the check for the second extruder was not correctly implemented. This commit fixes that issue by checking if the global stack has the specified extruder. If it does not, then the function returns while logging the issue. CURA-7048	2019-12-17 10:55:28 +01:00
Nino van Hooff	cef0ae349d	Fix selecting a new material for a base file on container deletion ... CURA-7023	2019-12-11 17:17:57 +01:00
Jaime van Kessel	b77de636d4	Prevent crashes when a variant could not be found ... This should not happen, but we've seen some cases where it would cause a crash, usually when a previous upgrade did something a bit weird (in this specific case; a printer with an empty variant, whereas it should have a variant). Since any change that the user will make will ensure that the variant is no longer empty (eg; any selection of a variant will mean it's no longer empty) and that there is no way back, it should be pretty safe to ignore the situation as it will resolve itself eventually CURA-6992	2019-12-05 14:19:18 +01:00
Jaime van Kessel	cd7f0e8a76	Fix case where a global profile would be recognised as a extruder profile ... CURA-6991	2019-12-05 14:17:55 +01:00
Jaime van Kessel	95cffb6710	Fix machine duplication when switching configuration	2019-12-05 14:06:52 +01:00
Remco Burema	5cae2fd098	Merge branch '4.4' into translations_4.4	2019-11-19 11:54:08 +01:00
Remco Burema	22fe13890e	Make sure translations are loaded before init. Intents. ... part of CURA-6957	2019-11-14 18:26:46 +01:00
Lipu Fei	c08e7df277	Fix typing ... CURA-6976	2019-11-13 11:10:12 +01:00
Nino van Hooff	fe27193c98	Add dict key check for a crash found in IntentManager ... CURA-6976	2019-11-13 11:01:03 +01:00
Lipu Fei	8228c6a743	Make sure position is not None ... CURA-6974	2019-11-12 14:22:21 +01:00
Jaime van Kessel	17b8e9930c	Add handling for case where variant could not be found ... CURA-6975	2019-11-12 13:28:12 +01:00
Jaime van Kessel	e2414ed5c9	Also log the exception when the connection failed to connect	2019-11-11 15:58:39 +01:00
Remco Burema	00f505374b	Merge pull request #6637 from Ultimaker/CURA-6917_unlink_duplicated_material_44 ... Cura 6917 unlink duplicated material	2019-11-07 17:23:28 +01:00
Remco Burema	3636eed964	Instead of selecting first, return only uniques. ... part of CURA-6917	2019-11-07 17:19:18 +01:00
Nino van Hooff	0b450ef9f4	Fix linked materials not being found due to key casing ... CURA-6917	2019-11-07 15:51:22 +01:00
Remco Burema	19d334f35c	Fix typing imports.	2019-11-07 14:31:38 +01:00
Jaime van Kessel	04304c1515	Correctly sort the intents in QualityManagementModel ... CURA-6956	2019-11-05 14:59:44 +01:00
Jaime van Kessel	ff8d8735de	Make the intents in QualityManagementModel also translated ... CURA-6956	2019-11-05 14:57:44 +01:00
Jaime van Kessel	674d8d387b	Move translations for intent to it's own file ... CURA-6956	2019-11-05 14:52:12 +01:00
Jaime van Kessel	870db0641b	Ensure that machines with 1.75mm filament select the right preferred material ... CURA-6950	2019-11-05 13:11:49 +01:00
Jaime van Kessel	366dd4bd00	Swap the splashscreen image ... RIP Ultibot :( CURA-6656	2019-11-05 09:33:50 +01:00
Jaime van Kessel	9d9d82dc24	Make logging when using a fallback for preferred material more explicit ... CURA-6950	2019-11-04 16:58:57 +01:00
Jaime van Kessel	2e3c3c7bd0	Change the engineering intent tooltip (again) ... Let's hope that this is the final one... CURA-6890	2019-11-04 16:07:15 +01:00
Nino van Hooff	8389c2c17a	Add the (probably) final intent profile descriptions (English) ... CURA-6890	2019-11-04 11:51:10 +01:00
Jaime van Kessel	1af1a8ddcb	Rename "smooth" intent to draft ... CURA-6890	2019-10-31 13:26:49 +01:00
Jaime van Kessel	f679b557dc	Add visual quality to model to be translatable ... CURA-6942	2019-10-31 11:54:06 +01:00
Jaime van Kessel	1284d9fe8d	Fix setting prefered material on machine creation ... The previous check would occasionaly set duplicated materials	2019-10-30 11:27:46 +01:00
Ghostkeeper	2beeca0687	Merge branch 'qml_speed_improvements'	2019-10-28 16:43:14 +01:00
Jaime van Kessel	26ba0e645a	Ensure that first start machine actions model gets initialized ... CURA-6932	2019-10-28 16:33:08 +01:00
Jaime van Kessel	9906d454ce	Merge branch 'qml_speed_improvements' of github.com:Ultimaker/Cura into qml_speed_improvements	2019-10-28 16:08:04 +01:00
Jaime van Kessel	7204deac0c	Rename function to beter reflect what it does ... CURA-6932	2019-10-28 16:07:35 +01:00
Ghostkeeper	95350cda51	Revert "Add a few process events to setActiveMachine to make it react more smooth" ... This reverts commit 27701f7653. After discussion with Nallath we've decided that it wasn't that noticeable and could temporarily display wrong names in the interface. We've decided to undo it for now. Contributes to issue CURA-6932.	2019-10-28 16:04:43 +01:00
Lipu Fei	b360e0db39	Fix numberExtrudersEnabled returning None ... CURA-6931	2019-10-28 10:44:24 +01:00
Jaime van Kessel	27701f7653	Add a few process events to setActiveMachine to make it react more smooth	2019-10-25 15:28:17 +02:00
Jaime van Kessel	93e97c5dce	Add update timer to intentCategory model	2019-10-25 15:15:21 +02:00
Jaime van Kessel	f090b5898e	Small qml speed improvements for setting item	2019-10-25 15:09:31 +02:00
Jaime van Kessel	98275d2da0	Create first start model on demand ... So if we don't use it, we don't spend any time on it.	2019-10-25 13:44:55 +02:00
Jaime van Kessel	552b456a69	Merge branch 'network-printer-selection-is-back' of github.com:Ultimaker/Cura	2019-10-25 12:49:18 +02:00
ChrisTerBeke	9a3ff527ac	Bring back the printer selection dialog for networked printers	2019-10-25 12:25:41 +02:00
Jaime van Kessel	3491900bf1	Fix grammar in a comment	2019-10-25 11:06:01 +02:00
Jaime van Kessel	d905b8b8cc	Add extra reporting stage for splash screen ... CURA-6823	2019-10-24 15:55:49 +02:00
Ghostkeeper	969b74e1f6	Prevent crash when sync list somehow contains None ... I couldn't figure out how it could ever contain None, but we received logs from a user that indicate a crash here because that set contains None and that is not orderable. This is a hotfix to fail more gracefully instead of crashing the entire application.	2019-10-24 11:56:08 +02:00
ninovanhooff	b9b086a8c0	Merge pull request #6542 from Ultimaker/CURA-6793_performance ... Performance improvements	2019-10-23 16:50:04 +02:00
Nino van Hooff	dd9e6e4abe	Merge branch 'master' into CURA-6665_api_decorator	2019-10-23 15:42:32 +02:00
Nino van Hooff	5436e68ea4	Fix mypy warning ... CURA-6665	2019-10-23 15:29:54 +02:00
ninovanhooff	9beea85482	Merge pull request #6566 from Ultimaker/CURA-6858_increase_sdk_ver_7_0 ... Change SDK version to 7.0.0	2019-10-23 11:54:49 +02:00