2310 Commits

Author	SHA1	Message	Date
Ghostkeeper	af8176d309	Merge branch 'master' of github.com:Ultimaker/Cura	2017-12-01 15:37:11 +01:00
Ghostkeeper	e5966de99d	Merge branch '3.1'	2017-12-01 15:13:11 +01:00
ChrisTerBeke	c3ddd12e16	Merge pull request #2882 from fieldOfView/fix_sidebar_estimation_tooltips ... Tweak layout and alignment of print time and cost estimation	2017-12-01 15:08:37 +01:00
Ghostkeeper	62185a8ef0	Add Traditional Chinese language option ... Contributes to issue CURA-4370.	2017-12-01 15:06:03 +01:00
Ghostkeeper	c0e7446f2a	Correct label of Save Project menu item ... Capital P. Ellipses to indicate that a modal window is coming. Ampersand to enable the hotkey.	2017-12-01 10:44:56 +01:00
fieldOfView	9564bb645f	Remove test code	2017-11-30 15:54:24 +01:00
Jaime van Kessel	1c1c195b93	When an printer gets added / removed, this is now correctly shown ... CL-541	2017-11-30 15:01:28 +01:00
Jaime van Kessel	339d7ca4c9	Cluster shows default controlItem again when a specific printer is selected ... CL-541	2017-11-30 14:36:53 +01:00
Jaime van Kessel	dea13899b3	Cluster can now "target" one of it's printers for display ... CL-541	2017-11-30 13:07:01 +01:00
fieldOfView	4303278602	Tweak layout and alignment of print time and (material) cost estimation... ... improving readability * table takes the full width and values are right-aligned * time estimates are shortened * values are right aligned * feature/time/percentage are on a single line again * handle long feature & material names gracefully Fixes #2712 * totals are only shown when there are multiple extruders	2017-11-30 10:35:31 +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
ChrisTerBeke	16e07fc461	Update color indicators for extruders when changing material color - CURA-4641	2017-11-29 10:47:39 +01:00
ChrisTerBeke	ce88b9ee67	Merge pull request #2692 from Ultimaker/reload_qml ... Added reload qml action	2017-11-28 15:50:47 +01:00
ChrisTerBeke	263230f9d2	Merge branch '3.1'	2017-11-28 15:45:57 +01:00
Lipu Fei	fa1d1ee3ad	Fix layer height slider auto switching ... CURA-4617	2017-11-28 14:35:44 +01:00
ChrisTerBeke	68cd9df65f	Merge branch '3.1'	2017-11-28 10:36:11 +01:00
ChrisTerBeke	7b30e9a6fc	Merge pull request #2856 from Ultimaker/simulation_view_gradient_changes ... Adapt gradient in Simulation view for better visualization of feedrates	2017-11-28 10:34:10 +01:00
ChrisTerBeke	a072af5585	Merge branch '3.1'	2017-11-27 17:17:02 +01:00
ChrisTerBeke	b74ebc57b4	Fix per extruder setting value depending on extruder count - CURA-4627	2017-11-27 17:00:57 +01:00
Jaime van Kessel	5d3779da26	Update cluster view components ... CL-541	2017-11-27 15:54:44 +01:00
Jaime van Kessel	083eee2e9d	Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite	2017-11-27 13:43:39 +01:00
Jaime van Kessel	00eeb835ac	ManualPrinterControl uses correct functions again ... CL-541	2017-11-27 10:22:30 +01:00
Jaime van Kessel	5036eccd32	Moved multiple components to their own files ... CL-541	2017-11-27 10:15:28 +01:00
Ghostkeeper	e0f0e098ff	Use MaterialsModel for materialsModel ... This specialized InstanceContainersModel has an override that makes the model a bit more efficient when non-materials get their metadata updated. Contributes to issue CURA-4243.	2017-11-27 09:54:40 +01:00
Diego Prado Gesto	fa00a17c78	Make UI changes in the Simulation View for adapting the color gradient ... in the Feedrate color scheme. Due to the travel speed is normally very high compared with the other speeds in the model, the gradient is now gradual instead of linear in order to show more changes in the low values and less changes in the high values. Adapt also the button styles and themes' colors. Set the play/pause button to the left and reduce the size.	2017-11-26 21:21:18 +01:00
Ruben D	ffef26097d	Merge branch '3.1'	2017-11-26 18:48:42 +01:00
Ruben D	0d0bcb8aea	Clip text that exceeds the width of the text box. ... For #2802.	2017-11-26 18:48:27 +01:00
Ruben D	8847325cf8	Remove limit on length for integer arrays ... The integer arrays were limited because the text in the text field is not properly clipped. I found a fix for that. Fixes #2802.	2017-11-26 18:47:58 +01:00
Jaime van Kessel	57de028608	re-implemented abort & pause for legacy um3 ... CL-541	2017-11-24 11:26:30 +01:00
Jaime van Kessel	57406100ef	Fixed status icon in monitor tab ... CL-541	2017-11-24 10:55:24 +01:00
Diego Prado Gesto	0b434978dd	CURA-4561 Add tooltip also to the Cancel button.	2017-11-24 10:34:38 +01:00
ChrisTerBeke	46a575b84f	Merge branch 'master' of https://github.com/Ultimaker/Cura	2017-11-24 10:31:30 +01:00
Jaime van Kessel	9d7cd72691	JobData is now shown in monitor screen again ... CL-541	2017-11-24 09:38:10 +01:00
Jaime van Kessel	219e285b20	Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite	2017-11-24 09:23:21 +01:00
Jaime van Kessel	c523a6ddf6	Progress is now shown for LegacyPrinter while printing ... CL-541	2017-11-24 09:22:50 +01:00
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