569 Commits

Author	SHA1	Message	Date
Jaime van Kessel	fb4ce43f0c	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-11-21 12:54:33 +01:00
Remco Burema	9aeb9912c8	Merge branch '4.4'	2019-11-19 15:57: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	d70a6e81b1	Merge 4.4	2019-11-12 14:39:30 +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
Lipu Fei	d13683f4db	Merge remote-tracking branch 'origin/4.4'	2019-11-11 08:13:53 +01:00
Jaime van Kessel	9940bc8551	Merge branch 'master' of github.com:Ultimaker/Cura	2019-11-08 13:38:58 +01:00
Jaime van Kessel	00078fd659	Remove a bunch of unused imports	2019-11-08 13:38:42 +01:00
Remco Burema	19d334f35c	Fix typing imports.	2019-11-07 14:31:38 +01:00
Lipu Fei	179d2c924d	Fix typing	2019-11-06 12:59:51 +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	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	26ba0e645a	Ensure that first start machine actions model gets initialized ... CURA-6932	2019-10-28 16:33:08 +01:00
Jaime van Kessel	93e97c5dce	Add update timer to intentCategory model	2019-10-25 15:15:21 +02:00
Ghostkeeper	94eb76a844	Merge branch 'master' into CURA-6793_performance ... Conflicts: cura/Machines/MaterialManager.py -> File was deleted in Master but I changed things for the lazy loading. cura/Machines/Models/BaseMaterialsModel.py -> I clarified documentation on a line above a place where a timer was added in between. Contributes to issue CURA-6793.	2019-10-23 09:58:08 +02:00
Jaime van Kessel	d3fb066cac	Merge branch 'CURA-6851' of github.com:Ultimaker/Cura	2019-10-21 11:49:12 +02:00
Nino van Hooff	b2f9dc612d	Change intent profile descriptions to not trigger pervs and prudes. ... CURA-6851	2019-10-21 10:33:52 +02:00
Lipu Fei	5602c71ec7	Fix material model update and signal recursion ... CURA-6904	2019-10-21 09:53:14 +02:00
Lipu Fei	5149baf593	Fix custom quality fetching ... CURA-6913	2019-10-21 09:06:07 +02:00
Nino van Hooff	915c8e560c	Fix mypy warning	2019-10-18 09:04:00 +02:00
Nino van Hooff	b182830c21	Add tooltips for intent profiles to the Custom Quality panel. ... The description is optional. Tooltip will not show if no description is set CURA-6853	2019-10-17 17:17:06 +02:00
Nino van Hooff	3709cfa4ed	Add tooltips for intent profiles to the Recommended Quality panel. ... The description is optional. Tooltip will not show if no description is set CURA-6853	2019-10-17 15:54:03 +02:00
Ghostkeeper	c12817170c	Merge branch 'master' into CURA-6793_performance	2019-10-16 15:47:41 +02:00
Ghostkeeper	7348c70af6	Don't get whole container to just get metadata ... A performance improvement, especially in the material models. Contributes to issue CURA-6793.	2019-10-16 13:56:23 +02:00
Ghostkeeper	401390209f	Robustness against missing approximate diameter ... Pretend like that material doesn't exist then. Contributes to issue CURA-6793.	2019-10-16 10:59:58 +02:00
Lipu Fei	ae6f0eb77e	Re-fix quality model update ... CURA-6883	2019-10-15 15:55:21 +02:00
Lipu Fei	d350c9e3d9	Update quality and intent models when extruders get changed ... CURA-6894	2019-10-15 15:53:55 +02:00
Ghostkeeper	f93f26444b	Revert "Fix QualityManagementModel update" ... This reverts commit fe8b7a48e6c4e7d4dc05d21f417a9968bef73cb3. This commit caused Cura to crash when creating a custom quality profile. Contributes to issue CURA-6883.	2019-10-15 15:33:41 +02:00
Ghostkeeper	ce4c5a1c93	Remove unnecessary listening to switching extruder tabs ... Also fix unnecessary emitting of switching extruder tabs. This should improve performance a lot. I tested a lot of things and am convinced that it didn't break anything. But the automated GUI tests and QA team should be the final arbiters of that... Contributes to issue CURA-6793.	2019-10-15 15:01:45 +02:00
Lipu Fei	0af8bd5e94	Fix merge conflicts	2019-10-15 15:00:03 +02:00
Nino van Hooff	e15952b25e	Merge remote-tracking branch 'origin/master'	2019-10-15 14:37:52 +02:00
Nino van Hooff	845cab5573	Clarified comment for duplicating materials	2019-10-15 14:37:37 +02:00
Lipu Fei	fe8b7a48e6	Fix QualityManagementModel update ... CURA-6883	2019-10-15 14:23:50 +02:00
Lipu Fei	43fa4337f9	Fix merge conflicts	2019-10-15 13:08:00 +02:00
Lipu Fei	36aab5d56b	Fix removeMaterials() and optimization ... CURA-6886	2019-10-15 13:04:57 +02:00
Ghostkeeper	b5c6a0a1e3	Merge branch 'master' into CURA-6793_performance	2019-10-14 17:17:10 +02:00
Lipu Fei	54f7892f2d	Sort built-in qualities by layer height for all ... CURA-6883	2019-10-14 15:25:30 +02:00
Lipu Fei	dd8f6dc10e	Fix ContainerTree reacting to duplicating materials ... CURA-6863	2019-10-14 12:24:05 +02:00
Ghostkeeper	23904e1dca	Don't cache machine manager and application ... This makes testing harder. Also fixed the typing of the application this way. Contributes to issue CURA-6793.	2019-10-08 14:16:19 +02:00
Jaime van Kessel	17ce0f5eb1	Remove unused imports	2019-10-08 10:59:37 +02:00
Lipu Fei	e4fa89ea4b	Simplify quality display name (label name) generation ... CURA-6706	2019-10-07 13:28:12 +02:00
Lipu Fei	d99386cf2e	Fix recommended mode ... CURA-6706	2019-10-07 12:58:41 +02:00
Lipu Fei	2033f24a17	Use catalog to translate intent category name ... CURA-6706	2019-10-07 12:41:52 +02:00
Lipu Fei	c42feae11c	Make intents work on quality management page ... CURA-6706	2019-10-07 09:22:47 +02:00