19026 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jaime van Kessel	854755277c	Fix styling of comments ... Because sentences should start with capitals	2018-11-27 14:37:01 +01:00
Jaime van Kessel	3ad1802ab6	Prevent a KeyError from messing ... CURA-5978	2018-11-27 14:34:29 +01:00
Ghostkeeper	609f07399e	Show extruder as disabled if either material or core is missing ... It basically just means you can't print with it. Contributes to issue CURA-5876.	2018-11-27 14:20:47 +01:00
Aleksei S	8784ecd49a	Change native rendering ... CURA-5941	2018-11-27 14:09:47 +01:00
Ghostkeeper	b0e9f23eee	Correct line colour when hovered ... A detail that I almost missed in the design examples. Contributes to issue CURA-5876.	2018-11-27 14:06:07 +01:00
Ghostkeeper	1555a1ab17	Make manufacturer and extruder labels lighter ... The proper colour would've been 'detail' but that seems to not be used much at all, and it's too light. In other places, 'inactive' is used in this place more often. Contributes to issue CURA-5876.	2018-11-27 14:03:05 +01:00
Ghostkeeper	bb9598afd1	Redesign layout of configuration item contents ... This is the new design. Contributes to issue CURA-5876.	2018-11-27 13:55:54 +01:00
Aleksei S	6956a732a0	Use tapbar component from UM, change the print_setup_widget width	2018-11-27 13:49:04 +01:00
Diego Prado Gesto	e863c34f68	Align the text to the center of the button ... Contributes to CURA-5942.	2018-11-27 13:33:35 +01:00
Ghostkeeper	cf8d88054d	Use proper colour for material in configuration item ... No idea this would be so easy. Contributes to issue CURA-5876.	2018-11-27 13:29:57 +01:00
Diego Prado Gesto	fcde6e3a34	Fix the open file button ... Now it has the correct size and it doesn't look blurry. Contributes to CURA-5942.	2018-11-27 13:28:28 +01:00
Ghostkeeper	b15c272d23	Fix applying configuration when clicking ... Also no longer use that signal for it. It was completely unnecessary. Contributes to issue CURA-5876.	2018-11-27 13:24:13 +01:00
Diego Prado Gesto	ea75a60dd8	Merge branch 'master' into ui_rework_4_0	2018-11-27 13:17:10 +01:00
Diego Prado Gesto	a6a364c337	Move material diameter and machine nozzle size to the extruder ... definition. Contributes to CURA-5902.	2018-11-27 13:12:47 +01:00
Ghostkeeper	89126c7323	Use background instead of contentItem ... This way the padding and such doesn't matter any more. And the original background disappears, which was unthemed and still behind the original contentItem. Contributes to issue CURA-5876.	2018-11-27 13:08:41 +01:00
Ghostkeeper	c6a9aca346	Switch checked and hovered themes ... I misunderstood the theme as it was in the screenshots. Contributes to issue CURA-5876.	2018-11-27 13:05:32 +01:00
Diego Prado Gesto	0794a2c8c9	Remove not needed printer and extruder definitions. ... Contributes to CURA-5902.	2018-11-27 13:03:36 +01:00
Ghostkeeper	81cadf702c	Give configuration items a rounded radius ... Contributes to issue CURA-5876.	2018-11-27 13:00:51 +01:00
Diego Prado Gesto	c56098d82c	Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin ... Tests for um3networkplugin	2018-11-27 12:59:44 +01:00
Jaime van Kessel	fb84b344ec	Add gradient to header bar	2018-11-27 12:58:06 +01:00
Ghostkeeper	e751b59b1c	Remove unused configuration item theme entries ... The theme of configuration items is now in sync with the rest of the interface. Contributes to issue CURA-5876.	2018-11-27 12:55:58 +01:00
Ghostkeeper	0be2453daf	Update style of border of configuration items ... Contributes to issue CURA-5876.	2018-11-27 12:55:07 +01:00
Ghostkeeper	e58409b1ef	Correct colours for the selected configuration ... This should always be the same as the ExpandableComponent's background, so white when it's not active and light blue when it's active, regardless of theme. The naming of this theme entry is a bit weird because the ActionButton theme is used for ExpandableComponent and now for ConfigurationItem as well, but that's why we should NEVER name these theme entries to something specific to one item. Oh well, I'm not about to refactor that now with all the branches going on everywhere. Contributes to issue CURA-5876.	2018-11-27 12:51:52 +01:00
Jaime van Kessel	1a6822436d	Add missing HoverEnabled property ... Some systems, like mine, don't have the hoverEnabled default set to true.	2018-11-27 12:01:43 +01:00
Jaime van Kessel	e04f14b50c	Also add shadow to openFile button	2018-11-27 12:01:05 +01:00
Jaime van Kessel	44c415ff78	Add shadow to ExpandableComponent	2018-11-27 11:58:32 +01:00
Ghostkeeper	a2b1f53979	Use normal text colour instead of specialised configuration item text ... They were the same anyway, and they should always be the same. Contributes to issue CURA-5876.	2018-11-27 11:53:17 +01:00
Ghostkeeper	6876c12106	Remove weird padding from button ... I don't know why the default Button has padding everywhere, but I don't want it. Contributes to issue CURA-5876.	2018-11-27 11:43:32 +01:00
Diego Prado Gesto	75b827d373	Modify the hover behavior by removing the mouse area. ... Contributes to CURA-5942.	2018-11-27 11:26:20 +01:00
Diego Prado Gesto	e2f85fcdc4	Add extra space to printer button. ... Contributes to CURA-5942.	2018-11-27 11:25:43 +01:00
Aleksei S	e6c2238fd5	Added popup spacing by Y coordinate ... CURA-5941	2018-11-27 11:24:09 +01:00
Ian Paschal	fd723e1084	Improve camera icon ... Contributes to CL-1150	2018-11-27 11:19:45 +01:00
Ian Paschal	a3f0630ee9	Rename printer images ... Contributes to CL-1150	2018-11-27 11:19:30 +01:00
Ghostkeeper	e05566865a	Use ExtruderIcon component to display extruder icon ... Since we already have that component pre-designed, let's use it. Contributes to issue CURA-5876.	2018-11-27 11:19:03 +01:00
Diego Prado Gesto	a01ff9419d	Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector	2018-11-27 11:13:34 +01:00
Diego Prado Gesto	729d37cabb	Merge branch 'master' into ui_rework_4_0	2018-11-27 11:12:48 +01:00
Ghostkeeper	c489f911fb	Use QtQuick 2.0 and simplify ConfigurationItem ... It now uses a ButtonGroup (from QtQuick2). Also, all the mess with when the border and background colours are updated and force-updated and such is now cleaned up. Contributes to issue CURA-5876.	2018-11-27 11:04:41 +01:00
Ian Paschal	475a94d10d	Add printer images ... Commit to CL-1150	2018-11-27 10:55:08 +01:00
Ian Paschal	8965695a59	Update MonitorPrintJobProgressBar.qml ... Contributes to CL-1150	2018-11-27 10:54:46 +01:00
Ian Paschal	616ec13457	Change context menu button size ... Contributes to CL-1150	2018-11-27 10:54:26 +01:00
Ian Paschal	7340b6dbc4	Update CameraButton.qml ... Contributes to CL-1150	2018-11-27 10:53:00 +01:00
Ian Paschal	0cd9c8e087	Add machine images ... Contributes to CL-1150	2018-11-27 10:52:49 +01:00
Lipu Fei	edf8460619	Return empty material model for empty material ... CURA-5982	2018-11-27 10:35:19 +01:00
Lipu Fei	a99c1f4f73	Merge pull request #4885 from Ultimaker/CURA-5961-NaN_infill_before_adding_printer ... Ensure that no weird data is set in the printSetupSelector on first start	2018-11-27 10:23:58 +01:00
Diego Prado Gesto	f91dbd356d	Merge branch 'master' of github.com:Ultimaker/Cura	2018-11-27 09:51:00 +01:00
Diego Prado Gesto	48853d0d06	Merge branch 'pinchies-add-a-u20'	2018-11-27 09:50:43 +01:00
Diego Prado Gesto	39e1cfd6bc	Fix indentation. ... Contributes to CURA-5902.	2018-11-27 09:50:01 +01:00
Lipu Fei	bd42136712	Fix GcodeStartEndFormatter to use fallback values ... CURA-5901 Use values from the global stack (if exist) as fallback values.	2018-11-27 09:49:38 +01:00
Diego Prado Gesto	493b37b0fe	Merge branch 'add-a-u20' of git://github.com/pinchies/Cura into pinchies-add-a-u20	2018-11-27 09:44:11 +01:00
Jaime van Kessel	8e7e8354e7	Set colors to the correct ones	2018-11-27 09:41:45 +01:00