712 Commits

Author	SHA1	Message	Date
Saumya Jain	6a7fe9a423	Merge branch '5.7' into CUR-11720-ucp-correct-ovverrides-ii	2024-03-18 15:45:11 +01:00
Saumya Jain	eac2d3b173	removes the unnecessary 'z' attribute ... CURA-11700	2024-03-18 14:51:55 +01:00
Saumya Jain	37dc9e5dcb	Update UI layering and MachineSelector properties in 3MFReader ... The z-index property of combobox and Loader elements in WorkspaceSection.qml was adjusted to ensure proper layering. CURA-11700	2024-03-18 14:47:24 +01:00
Saumya Jain	4da17d643d	Update model data handling in 3MFReader plugin ... partially revert 4dd0113a784687c0fd0ed5397acb9a4bf01d428c CURA-11720	2024-03-18 12:46:10 +01:00
Saumya Jain	5eeee37f0e	Update visibility condition in WorkspaceDialog ... CURA-11700	2024-03-18 12:32:34 +01:00
Saumya Jain	1ebab878fe	Merge branch '5.7' into CURA-11700-trigger-area-for-selecting-machine	2024-03-18 12:31:41 +01:00
Saumya Jain	522310b48a	Merge branch '5.7' into CUR-11720-ucp-correct-ovverrides-ii	2024-03-18 12:17:16 +01:00
c.lamboo	4dd0113a78	Add dedicate functions for exportedSettingModelItems and exportedSettingModelRowCount	2024-03-18 12:14:58 +01:00
c.lamboo	a58cd69b39	use notify to update exportedSettingModel	2024-03-18 11:55:50 +01:00
Saumya Jain	59d395a121	Added learn more button while saving and opening UCP ... CURA-11734	2024-03-15 12:20:56 +01:00
Saumya Jain	40bc08f482	Apparantly the first time override is written it is not overriden by next upload. ... Now, it does CURA-11720	2024-03-14 17:09:11 +01:00
Saumya Jain	b5940a54f4	fixing size of drop down ... CURA-11700	2024-03-14 16:17:34 +01:00
Saumya Jain	b245cce4e6	Merge branch '5.7' into CURA-11700-trigger-area-for-selecting-machine	2024-03-14 13:40:07 +01:00
Remco Burema	7013afae16	Merge pull request #18591 from Ultimaker/CURA-11701-profile-changes-to-unsupported ... not clearing the current machinein case of UCP	2024-03-14 13:00:13 +01:00
Saumya Jain	9604674c8b	Added Cura.MachineSelector in place of combobox ... combobox seemed to be tampering with the mouse area of machineselector CURA-11700	2024-03-14 11:45:15 +01:00
Saumya Jain	e90cbcfa01	not clearing the current machinein case of UCP ... because we don't want to write again the same thing. CURA-11701	2024-03-13 13:38:46 +01:00
Saumya Jain	cf7f807b41	placing Setting loaded from ucp on top before Suggested Profile setting ... CURA-11721	2024-03-13 09:52:50 +01:00
Erwan MATHIEU	ff4652e16a	Add comments not to translate "Universal Cura Project"	2024-03-11 12:49:11 +01:00
Saumya Jain	831a1d4876	Reset openAsUcp at the start of preread ... CURA-11403	2024-03-06 12:32:05 +01:00
Saumya Jain	8ef7b65710	removing update existing/ create new in case of UCP ... also, making sure post processing scripts are not loaded. CURA-11403	2024-03-05 16:37:17 +01:00
Saumya Jain	3e23ce1c37	code review fixed for PAP ... CURA-11403	2024-03-05 14:08:39 +01:00
Saumya Jain	68669794de	selected printer is active printer also in case it is a cloud printer ... CURA-11403	2024-03-04 18:03:11 +01:00
Saumya Jain	c879809836	selected printer is active printer in UCP ... CURA-11403	2024-03-04 16:47:09 +01:00
Saumya Jain	f19320cad8	update the setting table while loading ucp the seond time ... CURA-11403	2024-03-04 11:58:21 +01:00
Saumya Jain	72f6540627	material and profile as suggested ... CURA-11403	2024-03-01 17:18:15 +01:00
Saumya Jain	b1b9660651	removing select same profile checkbox ... CURA-11403	2024-03-01 15:43:37 +01:00
Saumya Jain	f67d2ed5fe	Remove setting visibility for Ucp ... show settings expanded by default CURA-11403	2024-03-01 15:25:24 +01:00
Saumya Jain	f3c49e494e	adding option of opening model as UCP or normal project file ... CURA-11403	2024-02-29 15:45:13 +01:00
Saumya Jain	1338a562ef	added drop models to buildplate as a right click option ... Also shortcut: ctrl+B CURA-10542	2024-02-27 13:45:10 +01:00
Saumya Jain	59d6593c17	fixing reloadvalue manager ... CURA-10542	2024-02-27 09:57:39 +01:00
Saumya Jain	55e5cd8982	adding dropto buildplate drop per model in 3mf ... CURA-10542	2024-02-26 14:58:53 +01:00
c.lamboo	62aff0be12	Determine ucp based on included file ... CURA-11403	2024-02-21 11:40:51 +01:00
c.lamboo	08b70252a4	Remove duplicated mime type ... CURA-11403	2024-02-21 11:24:09 +01:00
Saumya Jain	ec871782c7	PAP adding save dialog before filesave window ... CURA-11403	2024-02-20 10:47:27 +01:00
saumya.jain	b641741e49	Added preference to show UFP saving dialog ... Changes saving to .ucp to .3mf	2024-02-16 14:11:07 +01:00
Saumya Jain	80d7536763	Merge branch 'main' into CURA-11561_mockup_pap	2024-02-16 11:47:32 +01:00
saumya.jain	d68a454fa9	function name change to getWorkplaceDropToBuildplate ... CURA-10542	2024-02-15 11:35:09 +01:00
saumya.jain	f54d6099cd	removed the preference made it a member of class platformphysics ... CURA-10542	2024-02-15 11:23:34 +01:00
Saumya Jain	be39c1c9ec	Merge branch 'main' into CURA-10542-drop_to_buildplate	2024-02-14 14:03:10 +01:00
saumya.jain	32d9e6b45c	preference does not change after user changes drop to buildplate for a model ... CURA-10542	2024-02-14 12:59:41 +01:00
saumya.jain	aa2abfbd2e	removing id of checkbox ... CURA-10542	2024-02-09 15:15:44 +01:00
saumya.jain	91a84674f0	Adding the preference drop to buildplate while opening Cura project ... CURA-10542	2024-02-09 15:11:56 +01:00
Erwan MATHIEU	345ddc40bb	Fix file opening failure ... CURA-11561	2024-02-09 11:54:49 +01:00
Erwan MATHIEU	93cb358599	Add FIXMEs where big changes are required ... CURA-11561	2024-02-09 07:43:48 +01:00
Erwan MATHIEU	671698d1a3	Restore useless import version bump ... CURA-11561	2024-02-07 08:49:05 +01:00
Erwan MATHIEU	31f3d6161d	Add missing file ... CURA-11561	2024-02-06 13:19:42 +01:00
Erwan MATHIEU	63c1eb8990	Rename to Universal Cura Project ... CURA-11561	2024-02-05 14:15:43 +01:00
Erwan MATHIEU	2ae9908334	Fix crash ... CURA-11561	2024-02-05 12:58:02 +01:00
Erwan MATHIEU	9afe5b46db	We now display the global and extruder settings in the dialog ... CURA-11561	2024-02-05 12:39:56 +01:00
Erwan MATHIEU	2d79479a26	Avoid displaying the discard changed dialog ... CURA-11561	2024-02-02 16:17:27 +01:00