2425 Commits

Author	SHA1	Message	Date
Jack Ha	6f708fef8f	Merge branch 'master' of github.com:Ultimaker/Cura	2017-11-23 15:27:32 +01:00
Jack Ha	b6410ecf12	CURA-4561 prepare button upgrades	2017-11-23 15:27:22 +01:00
Mark	49705492ce	Merge branch '3.1'	2017-11-23 14:37:31 +01:00
Lipu Fei	dad2dfda89	No need to set currentItem after a material is imported ... CURA-4546	2017-11-23 14:08:10 +01:00
Aleksei Sasin	1141368682	Hide icons if monitor view is selected CURA-4527	2017-11-23 12:54:53 +01:00
Mark	835a0fb5d3	Merge branch 'master' of github.com:Ultimaker/Cura	2017-11-23 10:39:00 +01:00
Mark	3477b902ab	Merge pull request #2834 from Ultimaker/CURA-4527_view_orientation ... Cura 4527 view orientation	2017-11-23 09:56:26 +01:00
Diego Prado Gesto	2042cdf155	Merge branch 'master' of https://github.com/Ultimaker/Cura	2017-11-22 20:11:24 +01:00
Diego Prado Gesto	b776afaf3d	CURA-4509 Changing layout of the print time information tooltip, ... now in two lines per feature. This is for avoid trimming the labels because they depend on the language.	2017-11-22 20:09:39 +01:00
Ghostkeeper	3823cca936	Disable Russian translation since it's incomplete ... The maintainer of this translation didn't want to continue spending time to keep his translation up-to-date. Contributes to issue CURA-4601.	2017-11-22 12:45:21 +01:00
Aleksei S	d7b230269b	The icons changed ... CURA-4527	2017-11-22 11:10:25 +01:00
Jaime van Kessel	f987e6d977	Functionality properties (canPause, canPreHeatBed, etc) are now in the Controller. ... It's actually up to the controller to say something about this, so this location makes more sense CL-541	2017-11-21 16:59:17 +01:00
Jaime van Kessel	0fe91db636	Moved HeatedBedBox to own qml file ... CL-541	2017-11-21 16:52:37 +01:00
Jaime van Kessel	34e808d585	PrinterOutputModel now has different extruders if it has more than one. ... It used to just fill the list with references to the first one created. CL-541	2017-11-21 16:36:51 +01:00
Jaime van Kessel	d8b12be5e4	LegacyUM3 now correctly gets material set ... CL-541	2017-11-21 16:26:17 +01:00
Jaime van Kessel	e3d07f1806	Moved ExtruderBox and OutputDeviceHeader to their own files. ... This makes it a whole lot easier to get an overview. CL-541	2017-11-21 16:06:30 +01:00
Jaime van Kessel	0f78b05802	Connection states changes are now tied into the UI again ... CL-541	2017-11-21 15:12:23 +01:00
Jack Ha	602e8c0e66	Changed 'Check material compatibility' to 'Check compatibility' because it's not only materials possibly being incompatible	2017-11-21 15:12:17 +01:00
ChrisTerBeke	657a91c525	Merge pull request #2685 from Ultimaker/container_stack_improvements ... Container stack improvements	2017-11-20 17:42:26 +01:00
Jaime van Kessel	7d28b26ff2	Merge branch 'master' of github.com:Ultimaker/Cura into qtquick-controls-2.0	2017-11-16 16:48:22 +01:00
Jack Ha	228039545b	CURA-4525 send active build plate to legacy UM3 with Print over network	2017-11-16 09:58:53 +01:00
Jack Ha	e2a663992c	CURA-4525 Added an option to turn on the UI elements of multi build plate	2017-11-15 17:00:19 +01:00
Aleksei S	ce0510cee3	Hide icons if they overlap monitor button ... CURA-4527	2017-11-15 16:34:22 +01:00
Jack Ha	864f417723	CURA-4525 Fix load and save projects. Not storing build plates or object names yet.	2017-11-15 16:03:32 +01:00
Aleksei S	3d2868c336	Added icons ... CURA-4527	2017-11-15 00:43:17 +01:00
Jack Ha	bd8aa8d989	CURA-4525 automatic build plate menu items using BuildPlateModel	2017-11-14 14:27:46 +01:00
Jack Ha	97f61366a8	CURA-4525 fix accidently remove all scenenodes when deleteAll	2017-11-13 16:51:07 +01:00
Jack Ha	e21acd1a07	CURA-4525 first multi slice + multi layer data, added filter on build plate, added option arrange on load, visuals like convex hull are now correct	2017-11-09 17:03:20 +01:00
Jack Ha	41d5ec86a3	CURA-4525 updated scene node menu and added multi buildplate arrange	2017-11-08 14:07:40 +01:00
Jack Ha	38670171f5	CURA-4525 party working objects list and build plates	2017-11-07 14:52:22 +01:00
Jack Ha	5050124699	CURA-4525 wip objects menu	2017-11-06 14:03:39 +01:00
Jack Ha	5b368fbfd5	CURA-4104 added first sucky build plate selection options	2017-11-06 14:03:03 +01:00
Aleksei S	7722e438c9	Changed orientation button location, adjusted call functins ... CURA-4527	2017-11-06 10:28:07 +01:00
ChrisTerBeke	d32b7f0091	Merge branch 'master' into container_stack_improvements	2017-11-06 09:49:44 +01:00
Aleksei S	fb8bde6f76	Added view rotation for each click ... CURA-4527	2017-11-03 15:29:33 +01:00
ChrisTerBeke	142ff4e9dc	Merge pull request #2669 from fieldOfView/feature_jogging ... Jogging	2017-11-01 16:15:40 +01:00
Aleksei S	87a7bf72a8	Monitor view, "connect" button position ... CURA-4509	2017-11-01 15:57:30 +01:00
ChrisTerBeke	4326884f97	Merge branch 'master' of https://github.com/Ultimaker/Cura	2017-11-01 15:54:43 +01:00
alekseisasin	db51054984	Merge pull request #2700 from fieldOfView/feature_cleanup_save_monitor_area ... Cleanup save/monitor button area	2017-11-01 15:53:20 +01:00
ChrisTerBeke	e2c62a4609	Revert "Remove unnecessary properties which after update triggered view rendering" ... This reverts commit ee228155af1677f3f375fb0b28b53ecef744d4d2.	2017-11-01 15:50:23 +01:00
Diego Prado Gesto	7f76749e2c	Merge branch 'CURA-4062_layerview_laggy'	2017-11-01 13:37:44 +01:00
ChrisTerBeke	743285f426	Merge branch 'master' into container_stack_improvements	2017-11-01 12:32:37 +01:00
Mark	512541be08	Change the font of the checkbox ... CURA-4503	2017-11-01 10:44:46 +01:00
ChrisTerBeke	7a8d562234	Merge branch 'master' into container_stack_improvements	2017-10-31 16:24:05 +01:00
Lipu Fei	324b39fc39	Fix layout for open project dialog ... CURA-4503	2017-10-31 16:20:01 +01:00
ChrisTerBeke	e7f1900f71	Remove layer height from custom profiles in dropdown as it might have changed - CURA-4482	2017-10-31 14:01:15 +01:00
alekseisasin	759c494aaa	Merge pull request #2703 from fieldOfView/fix_setting_text_on_focus ... Stop SettingTextField from setting values when getting/losing the focus	2017-10-31 12:47:25 +01:00
Aleksei S	f1db8ed001	Show message (hover slieder) if user selected custom quality profile in recomended mode ... CURA-4466	2017-10-31 11:07:45 +01:00
Aleksei S	f7ce4cc78a	Merge branch 'master' of github.com:Ultimaker/cura	2017-10-31 10:27:35 +01:00
Aleksei S	e0c1afe01f	Added Request package information to AboutDialog.qml ... CURA-4415	2017-10-31 10:26:42 +01:00