310 Commits

Author	SHA1	Message	Date
Lipu Fei	eaa27114c6	Fix ID changing in project loading	2017-12-21 12:43:50 +01:00
Lipu Fei	196bffd3ad	Only try to get a new unique name when it already exists ... CURA-4704	2017-12-20 13:20:24 +01:00
Lipu Fei	4f28dec884	Fix typo	2017-12-20 13:19:48 +01:00
Ghostkeeper	1029d4509c	Merge branch 'master' into feature_local_container_server	2017-12-08 16:03:05 +01:00
Ghostkeeper	96c38bce2b	Merge branch '3.1'	2017-11-30 16:57:01 +01:00
ChrisTerBeke	d76081ae1d	Only restore global profile based on extruders that are actually in use when loading legacy project file	2017-11-30 16:24:46 +01:00
Ghostkeeper	dad99f5292	Merge branch 'master' into feature_local_container_server ... Contributes to issue CURA-4243.	2017-11-29 13:06:08 +01:00
Ghostkeeper	8707396ad7	Remove isReadOnly functionality ... Everyone should now ask it from the container registry. Contributes to issue CURA-4243.	2017-11-28 17:30:00 +01:00
Ghostkeeper	c63ef6fed6	Remove unused variables ... The machine_name variable is later redefined. Contributes to issue CURA-4243.	2017-11-28 16:58:04 +01:00
ChrisTerBeke	e3f1144d97	Update creating QML component in plugin browser - CURA-4568	2017-11-28 14:25:09 +01:00
Lipu Fei	7d01e3388f	Merge remote-tracking branch 'upstream/3.1'	2017-11-28 11:36:03 +01:00
Lipu Fei	6db06ea713	Fix project loading for single-extrusion machines ... CURA-4617	2017-11-28 11:17:17 +01:00
ChrisTerBeke	a072af5585	Merge branch '3.1'	2017-11-27 17:17:02 +01:00
Lipu Fei	33a06e13a9	Remove legacy if check in project loading ... CURA-4617	2017-11-27 14:27:11 +01:00
Lipu Fei	49cac860a8	Fix project loading ... CURA-4617	2017-11-27 14:17:13 +01:00
Ghostkeeper	17a25f98a4	Merge branch '3.1'	2017-11-27 13:58:52 +01:00
Jaime van Kessel	0613b1e4b7	Creating components is now done with the prefab function ... CURA-4568	2017-11-27 13:00:49 +01:00
Lipu Fei	828fff5ee5	Fix quality check in project loading ... CURA-4617	2017-11-27 12:04:21 +01:00
Lipu Fei	46c6c6aa9b	Fix quality profile in project loading ... CURA-4617	2017-11-27 11:19:40 +01:00
Lipu Fei	4a4f01f9eb	Fix resetting not supported profiles for project loading ... CURA-4617	2017-11-27 10:52:29 +01:00
ChrisTerBeke	8082c092e5	Fix setting extruder definition in user changes container	2017-11-27 09:54:10 +01:00
Ghostkeeper	ebe766a7c8	Set definition by their ID ... The new function for setting the definition just adds the ID to the metadata. Contributes to issue CURA-4243.	2017-11-24 16:45:09 +01:00
Lipu Fei	6b3e130349	Fix edge cases with ultimaker2 and whatever other machines that may get affected ... CURA-4617	2017-11-23 16:28:36 +01:00
Lipu Fei	ef37f0d8c7	Fix project loading to reset quality if it doesn't exist ... CURA-4617	2017-11-23 15:35:33 +01:00
Lipu Fei	033cc4fbc7	Fix quality update in project loading ... CURA-4613	2017-11-23 14:12:41 +01:00
Lipu Fei	1db448d7d8	Use the correct quality container for global stacks loaded from project files ... CURA-4613	2017-11-23 13:04:06 +01:00
Lipu Fei	18c7a5acf3	Pass optional file_name for deserialization ... CURA-4613 Some upgrades depend on the file_name, so the file_name is needed in this case.	2017-11-23 11:28:16 +01:00
Ghostkeeper	105d7a5615	Return newly added single extruder ... The workspace reader needs to use it to get the correct material. Contributes to issue CURA-4604.	2017-11-22 17:12:53 +01:00
Diego Prado Gesto	feb0a08fd9	CURA-4581 The project name is cached instead of set	2017-11-21 12:34:08 +01:00
ChrisTerBeke	657a91c525	Merge pull request #2685 from Ultimaker/container_stack_improvements ... Container stack improvements	2017-11-20 17:42:26 +01:00
Ghostkeeper	3a9c8d16a2	Fix remaining references to instance_container._id ... These must've slipped through the cracks. Contributes to issue CURA-4243.	2017-10-30 15:07:46 +01:00
Lipu Fei	0096fe0de3	Fix project loading to handle "Not Supported" quality profiles ... CURA-4451	2017-10-30 12:54:21 +01:00
Ghostkeeper	6c4c7fff4d	Use findContainersMetadata whenever possible ... This ensures that we only load those containers that we actually need the data of. Contributes to issue CURA-4243.	2017-10-20 15:09:45 +02:00
Ghostkeeper	7745113704	Re-use stack variable ... We're creating the variable but then requesting the 0th element from the list each time... That can be more logical and more efficient. Contributes to issue CURA-4243.	2017-10-19 15:32:21 +02:00
Lipu Fei	052ea7d90a	Force use and update the job name with the loaded project file ... CURA-4348 - If no project is loaded beforehand and then a model file is loaded, the job name should be determined with the current machine name and the first loaded model name. - If a project is loaded, the job name should be the same as the project name, and it should not change until another project is loaded.	2017-10-12 07:59:43 +02:00
Lipu Fei	245eec9314	Hide settings visibility row if it is not in preferences ... CURA-4344 Hide the row which shows the number of settings that are visible on the project file loading dialog if this information is not available.	2017-10-10 11:31:37 +02:00
ChrisTerBeke	91e8e5812b	add back missing function	2017-10-10 09:24:48 +02:00
ChrisTerBeke	641b3c21f7	fix merge conflicts	2017-10-10 09:21:31 +02:00
Lipu Fei	b14ef41056	Increase the minimumHeight of the workspace summary dialog ... CURA-4428	2017-10-10 08:30:18 +02:00
Diego Prado Gesto	1d70426224	onVisibilityChanged function removed because it's never called - CURA-4405	2017-10-09 16:36:48 +02:00
Lipu Fei	8a25605413	Fix lock issue with workspace dialog ... CURA-4405 - Add try-except around lock release - Fix closing the dialog with ESC	2017-10-09 15:17:56 +02:00
Mark	2e957069a8	first hide the dialog then release the lock ... CURA-4405	2017-10-09 11:58:58 +02:00
Mark	59fbbef43e	first hide the dialog then release the lock ... CURA-4405	2017-10-09 11:58:00 +02:00
A.Sasin	2288997697	Fixed: while project loading pass call upgrade plugin for preferences ... CURA-4344	2017-10-06 18:56:17 +02:00
Lipu Fei	185c350a19	Merge remote-tracking branch 'upstream/3.0'	2017-10-05 15:49:18 +02:00
Lipu Fei	8a27b2e97b	Fix typo in WorkspaceDialog.qml	2017-10-05 15:48:38 +02:00
Lipu Fei	0eeded7930	Fix KeyError in WorkspaceDialog ... CURA-4404	2017-10-05 14:11:16 +02:00
Ghostkeeper	d458fcde5c	Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"" ... This reverts commit e07e7bc9e714843cf853f0a255ee5a8432696886. Contributes to issue CURA-4414.	2017-10-05 10:58:49 +02:00
Ghostkeeper	e07e7bc9e7	Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0" ... This reverts commit b62c19206f5e494fa27eb0b877197556c559e449, reversing changes made to 104926c6ed1648ec20b4308fdacad4e99c14c8b3. Contributes to issue CURA-4414.	2017-10-05 10:28:54 +02:00
ChrisTerBeke	b62c19206f	Merge branch 'fix_garbled_fonts_macos' into 3.0	2017-10-04 14:09:59 +02:00