5210 commits

Author	SHA1	Message	Date
Ian Paschal	e877b47e22	Disable printer cards which are not in focus ... Contributes to CL-1151	2018-12-14 16:55:48 +01:00
Ian Paschal	6747fe3550	Merge remote-tracking branch 'origin/4.0' into CL-1151_add_monitor_carousel	2018-12-14 16:31:47 +01:00
Ian Paschal	2789a0fdc4	Revert "Quick fix to prevent monitor stage from overlapping header" ... This reverts commit 3766effa81.	2018-12-14 16:13:35 +01:00
Ian Paschal	3766effa81	Quick fix to prevent monitor stage from overlapping header	2018-12-14 16:04:31 +01:00
Ian Paschal	30168103b7	Update MonitorStage.qml	2018-12-14 15:47:36 +01:00
Ian Paschal	3bd5d141ab	Add easing and make animation less snappy and awesome ... Contributes to CL-1151	2018-12-14 15:39:17 +01:00
Ian Paschal	2f6a274c0e	Small style improvements ... Contributes to CL-1151	2018-12-14 15:27:55 +01:00
Ian Paschal	b2ea597543	Fix button color ... Contributes to CL-1151	2018-12-14 15:10:34 +01:00
Ian Paschal	5d0da580b9	Fix border colors	2018-12-14 15:04:22 +01:00
Ghostkeeper	2e835bf48d	Merge branch '4.0'	2018-12-14 15:02:30 +01:00
Ian Paschal	7fc5742b7f	Add monitor carousel ... Contributes to CL-1151	2018-12-14 15:01:40 +01:00
Jaime van Kessel	b70a4ae0a2	Merge branch 'CURA-6015_fix_osx_crash' of github.com:Ultimaker/Cura into 4.0	2018-12-14 13:35:37 +01:00
Ghostkeeper	64e436f814	Merge branch '4.0'	2018-12-14 13:27:54 +01:00
Jaime van Kessel	6a3ac99551	Ensure that all icons use the same color from theme. ... Also added some fixes for the dark theme	2018-12-14 11:59:22 +01:00
Lipu Fei	cd3a9e02d6	Merge remote-tracking branch 'origin/4.0' into CURA-6015_fix_osx_crash	2018-12-14 11:45:51 +01:00
Ghostkeeper	bb45680b98	Merge branch '4.0'	2018-12-13 16:49:57 +01:00
Ghostkeeper	3f3cd5e334	Remove broken load of PrepareSidebar.qml ... This file no longer exists. Loading it gives a warning.	2018-12-13 16:32:49 +01:00
Diego Prado Gesto	aa2fa371c4	Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0	2018-12-13 14:32:28 +01:00
Diego Prado Gesto	17f0c12858	Make the middle component to have zero width if there is no component to ... fill the gap. Contributes to CURA-6020.	2018-12-13 14:31:34 +01:00
Lipu Fei	620790ae3d	Reduce the creations of ExtrudersModels ... CURA-6015	2018-12-13 14:12:23 +01:00
Lipu Fei	2cf80b4578	Remove unused simpleNames flag ... CURA-6015	2018-12-13 14:12:04 +01:00
Jaime van Kessel	b64882bb1e	Merge branch 'quit_cura_button' of github.com:Ultimaker/Cura into 4.0	2018-12-13 13:23:47 +01:00
Diego Prado Gesto	121af7ad60	Reuse the primary button in the toolbox for the "Quit Cura" button	2018-12-13 09:41:07 +01:00
Diego Prado Gesto	635115a879	Merge pull request #4982 from Ultimaker/fix_preview_stage_menu ... Fix preview stage menu	2018-12-13 09:32:01 +01:00
alekseisasin	a505adbf40	Merge pull request #4945 from Ultimaker/CURA-6006-login-required ... [4.0] CURA-6006 login required	2018-12-12 11:31:38 +01:00
alekseisasin	64104e47c6	Merge pull request #4970 from Ultimaker/fix_preview_stage_menu ... Fix preview stage menu	2018-12-12 11:22:08 +01:00
Remco Burema	1b2ef91c13	Merge branch 'CURA-6016_Improve_UI_Speed' into 4.0	2018-12-12 10:54:36 +01:00
Lipu Fei	f302a76d3a	Fix typing issue in Toolbox ... CURA-6006	2018-12-12 10:47:18 +01:00
Remco Burema	65f1c9a304	Merge pull request #4969 from Ultimaker/CURA-6016_Improve_UI_Speed ... Cura 6016 improve ui speed	2018-12-11 17:26:15 +01:00
Ian Paschal	1ababf38ad	Use full printer name if no tag is known ... Contributes to CL-1173	2018-12-11 16:42:44 +01:00
Ian Paschal	daeb86bdb1	Use short printer family tags ... Contributes to CL-1173	2018-12-11 15:55:03 +01:00
Diego Prado Gesto	c804610fa6	Make the stage menu in the preview using 85 percent of the total width in order to prevent the print setup panel to be in the middle	2018-12-11 15:19:40 +01:00
Diego Prado Gesto	742fc34e75	Change labels in the layer view legend	2018-12-11 14:31:12 +01:00
Diego Prado Gesto	db56aa028c	Change the swatch from a circle to the extruder icon	2018-12-11 13:59:36 +01:00
Diego Prado Gesto	faa3f42acc	Modify the header in the simulation view menu component ... This is needed to align with the designs.	2018-12-11 13:53:05 +01:00
Jaime van Kessel	75ff03f3c8	Use setState instead of emitting the backend state ... CURA-6016	2018-12-11 13:13:20 +01:00
Diego Prado Gesto	1f26b55731	Merge pull request #4966 from Ultimaker/CL-1160_fix_materials_none_type ... CL-1160 Replace fix for 'None' materials	2018-12-11 12:14:34 +01:00
Diego Prado Gesto	4949f39c34	Add translatable strings to empty and unknown material ... Contributes to CL-1160.	2018-12-11 12:10:32 +01:00
Diego Prado Gesto	70b0d16fa4	Fix typo ... Missing parenthesis. Contributes to CL-1160.	2018-12-11 11:53:26 +01:00
Ian Paschal	1c373b7205	Improve config override text ... Contributes to CL-1152	2018-12-11 11:51:13 +01:00
Diego Prado Gesto	2b2e8ebb31	Add some safety checks when checking for the guid of the material ... Don't crash if the guid doesn't exist. Contributes to CL-1160.	2018-12-11 11:37:01 +01:00
Ian Paschal	0f357e1078	Replace fix for 'None' materials ... This was fixed in 4.0 and accidentally got reverted when merging another branch in. Contributes to CL-1160	2018-12-11 10:51:05 +01:00
Ian Paschal	d43ba59b7c	Merge pull request #4959 from Ultimaker/CL-1152_config_change_monitor_tab ... CL-1152 config change monitor tab	2018-12-10 16:43:57 +01:00
Ian Paschal	0e19fa731f	Codestyle ... Contributes to CL-1152	2018-12-10 15:47:45 +01:00
Ian Paschal	04af8fbd50	Update MonitorConfigOverrideDialog.qml ... Contributes to CL-1152	2018-12-10 15:33:16 +01:00
Ian Paschal	028d993bab	Format .gcode.gz files too ... Contributes to CL-1152	2018-12-10 15:27:51 +01:00
Ian Paschal	32f2b7ec1f	Fix some warnings ... Contributes to CL-1152	2018-12-10 15:05:01 +01:00
Ian Paschal	2db5d2b231	Add support for translation plurals ... Contributes to CL-1152	2018-12-10 14:54:45 +01:00
Ian Paschal	df0ae20dde	Let's just get stepped up in here and get some personal space ... Contributes to CL-1152	2018-12-10 14:39:15 +01:00
Lipu Fei	69744282e6	Fix rounding issue in toolbox QML widget size ... CURA-6006	2018-12-10 14:38:40 +01:00