666 Commits

Author	SHA1	Message	Date
fieldOfView	1b3c51d98a	Remove extraneous preference	2020-03-31 11:57:45 +02:00
fieldOfView	ccc0589495	Remove the checkbox option to set the preference to hide the messagebox	2020-03-31 11:50:16 +02:00
fieldOfView	b7898b5a97	Change preference to only hide the xray message, not the visualization	2020-03-31 11:39:05 +02:00
fieldOfView	4638e2b72b	Fix resetting show xray warning	2020-03-31 11:27:25 +02:00
Ghostkeeper	0150f37937	Merge branch 'master' into xray_in_solid_view	2020-03-24 21:45:48 +01:00
Ghostkeeper	d7d91d2fec	Don't translate 'Language:' string ... This should make it easier to find the language drop-down again if you can't read the current language. Done as a 5 minute fix.	2020-03-10 11:19:32 +01:00
Ghostkeeper	7b0964abef	Merge branch 'DenyCZ-4.5'	2020-03-09 16:57:09 +01:00
Ghostkeeper	0c9a8d3a7c	Add Czech language to the list ... You can now select Czech as your Cura language. Contributes to issue CURA-7285.	2020-03-09 16:55:13 +01:00
Jaime van Kessel	68ad38de28	Fix sizing of the machine action dialog ... Contributes to #7224	2020-03-06 11:02:59 +01:00
Tim Kuipers	4b1a426873	add xray error warning preference	2020-02-27 16:41:20 +01:00
Ghostkeeper	0dfa65bb6d	Disable Polish translation for 4.5 ... These translations weren't updated this round, so we'll disable them from the interface. The files are still available if someone else wants to translate them. Contributes to issue CURA-7201.	2020-02-24 14:17:21 +01:00
Jaime van Kessel	a706b42782	Disable create & import on materialpage if machine does not support materials	2020-01-27 16:12:26 +01:00
Remco Burema	9aeb9912c8	Merge branch '4.4'	2019-11-19 15:57:52 +01:00
Remco Burema	f1f0290458	Re-enable the Polish language. ... part of CURA-6957	2019-11-19 14:22:53 +01:00
Jaime van Kessel	c6f42766c7	Remove hardcoded sizes from dialogs & popups ... Contributes to #6670	2019-11-19 13:00:39 +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	6e79f489e2	When multiple linked materials are found, only display the first ... CURA-6917	2019-11-07 15:51:22 +01:00
Jaime van Kessel	e805c3db05	Ensure material is selected on first opening of material manager	2019-10-25 11:05:38 +02:00
Lipu Fei	38ee4bf208	Remove deprecated functions in MachineManager ... CURA-6858	2019-10-22 14:11:40 +02:00
Lipu Fei	4aadcba01c	Merge pull request #6549 from Ultimaker/CURA-6897_qml_warnings_materials_page ... CURA-6897_qml_warnings_materials_page	2019-10-21 08:50:31 +02:00
Jaime van Kessel	0aa2a4994c	Merge branch 'feature_restore_window_geometry' of https://github.com/fieldOfView/Cura	2019-10-18 10:45:28 +02:00
Nino van Hooff	8322a36548	Fix some QML warnings in the MaterialsPage	2019-10-16 16:59:52 +02:00
Lipu Fei	59fa73448a	Fix material diameter change ... CURA-6868	2019-10-15 15:03:35 +02:00
Lipu Fei	43fa4337f9	Fix merge conflicts	2019-10-15 13:08:00 +02:00
Lipu Fei	8b913f4009	Merge remote-tracking branch 'origin/master' into CURA-6863_duplicated_material_oddness	2019-10-14 12:23:49 +02:00
Remco Burema	09dc6ae44a	Scouting: Try not to spam signals or errors as much. ... nominally part of CURA-6863	2019-10-14 01:03:41 +02:00
Remco Burema	4277ede64f	Fix 1/2 of the duplication material bug. ... The material is added multiple times to the variant nodes, and overwriting it with the eventual right one was going wrong. This does not solve it entirely (because the less specific one still ends up selected _initially_ because it gets added first, and the order can't be guaranteed. part of CURA-6863	2019-10-14 01:01:19 +02:00
Nino van Hooff	c8d65e86f1	Truncate/elide/ellipsize the material name in Preferences ... if it doesn't fit it's parent CURA-6862	2019-10-10 15:36:14 +02:00
Jaime van Kessel	cadc145008	Prevent infinite recursion in material page if it could not be found	2019-10-08 16:49:54 +02:00
Lipu Fei	28466f7345	Elide long quality name ... CURA-6862	2019-10-08 14:33:16 +02:00
Ghostkeeper	cf14fa6820	Merge branch 'feature_intent' ... Here we go! Contributes to issue CURA-6864.	2019-10-08 13:17:54 +02:00
Ghostkeeper	f8449796c9	Reset the camera origin when uninverting zoom direction ... If zoom-to-cursor has been activated the camera origin will end up behind the camera. This resets it. Fixes #6490.	2019-10-08 13:06:23 +02:00
Lipu Fei	c42feae11c	Make intents work on quality management page ... CURA-6706	2019-10-07 09:22:47 +02:00
Lipu Fei	ba805b9da3	Fix QML errors ... CURA-6849	2019-10-03 12:28:07 +02:00
Lipu Fei	07269e4988	Merge remote-tracking branch 'origin/master' into feature_intent	2019-09-25 08:03:37 +02:00
Lipu Fei	94e89ad4ac	Fix merge conflicts with master	2019-09-24 14:26:43 +02:00
Ghostkeeper	0b4a3039e5	Remove multi-buildplate option ... It doesn't work any more.	2019-09-24 14:24:57 +02:00
Ghostkeeper	5ec833c15e	Remove extraenous space ... This space triggers PoEdit to give a warning that the translation doesn't have the space there. That's okay, since it's a column and the space doesn't influence spacing then.	2019-09-23 11:43:24 +02:00
fieldOfView	c9e281f52e	Add preference for general/restore_window_geometry ... See https://github.com/Ultimaker/Uranium/pull/523	2019-09-20 14:51:37 +02:00
Ghostkeeper	4a68e7ec95	Fix favorite materials without material manager ... We just track it via the preference value itself rather than duplicating that in any other data structure. It's simple enough. Contributes to issue CURA-6776.	2019-09-20 09:57:36 +02:00
Ghostkeeper	47e1dbe38d	Remove usage of Quality Manager ... This class is deprecated. Constructing it here means that the class gets constructed on the Qt thread and makes it inaccessible for the rest. Contributes to issue CURA-6600.	2019-09-10 14:55:32 +02:00
Ghostkeeper	0d68381e61	Code style: brackets on new line ... Contributes to issue CURA-6600.	2019-09-10 14:52:51 +02:00
Ghostkeeper	b5d32a9b70	Move createQualityChanges function to QualityManagementModel ... This function is specific to the management page (for the most part; some things seem to call the _createQualityChanges private function nonetheless). Contributes to issue CURA-6600.	2019-09-02 17:07:18 +02:00
Ghostkeeper	b3fd310d37	Move removeQualityChangesGroup to QualityManagementModel ... This is an operation specific to the quality management page, so it should be located there. Contributes to issue CURA-6600.	2019-08-28 15:21:33 +02:00
Ghostkeeper	21412986d3	Remove material manager from MaterialsPage ... It is no longer used now that everything relevant has been moved to a separate class for this page specifically. Contributes to issue CURA-6600.	2019-08-27 18:01:35 +02:00
Ghostkeeper	3952366798	Move createMaterial to MaterialManagementModel and simplify it a bit ... We can reuse our duplicateMaterial function again but in a simpler way. Also finding the preferred material is simpler with our container tree. However there seems to be a problem with finding the preferred material; it's not finding generic_pla for UM3 and AA0.4 anyway, and then falls back on a random material. This needs to be fixed in the variant node class. Contributes to issue CURA-6600.	2019-08-27 17:21:22 +02:00
Ghostkeeper	1874a6453d	Move duplicateMaterial into MaterialManagementModel ... To move away from the deprecated MaterialManager class. Contributes to issue CURA-6600.	2019-08-27 17:21:21 +02:00
Remco Burema	c71660cc11	Fix occasional crash when entering profiles section. ... Make QualityManagementModel into a singleton. part of CURA-6600	2019-08-27 16:21:30 +02:00
Ghostkeeper	8346e465f6	Turn MaterialManagementModel into a singleton ... Just like MaterialManager used to be. There can be only one instance of the page then. This prevents a crash when Qt deletes the QObject because it's no longer used in the page when you close the preferences screen. But when you open it again it doesn't construct a new one. Now there is always one instance so that's not a problem any more. Also it allows other pages to access this item. Contributes to issue CURA-6600.	2019-08-27 15:47:41 +02:00
Ghostkeeper	3dc7c7b61c	Move removeMaterial to MaterialManagementModel ... Moving away from the MaterialManager. Contributes to issue CURA-6600.	2019-08-27 15:47:40 +02:00