19507 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Diego Prado Gesto	14b460a626	Remove unused styles	2018-11-27 17:25:10 +01:00
Diego Prado Gesto	309061ce31	Add a new ToolbarButton ... Now also the Extruder button is a toolbar button since it will show in the toolbar.	2018-11-27 17:16:52 +01:00
Ghostkeeper	0b8a56458d	Remove unused CustomConfigurationSelector ... I checked. It is no longer used. Contributes to issue CURA-5876.	2018-11-27 17:11:32 +01:00
ChrisTerBeke	26f107d176	Use cluster_id as dict key, remove unneeded white space	2018-11-27 17:03:19 +01:00
ChrisTerBeke	4e150fb4bf	Merge branch 'master' into cloud-output-device	2018-11-27 16:59:28 +01:00
Ghostkeeper	26c7558a53	Don't show labels if controls themselves are not shown ... The height of the popup is luckily automatically adjusted now. Contributes to issue CURA-5876.	2018-11-27 16:44:16 +01:00
Aleksei S	ff851b0382	Added margins ... CURA-5941	2018-11-27 16:36:27 +01:00
Diego Prado Gesto	dad2031e4b	Switch to the preview stage before to switch to simulation view ... ... since now the list of views are in a different stage. Contributes to CURA-5979.	2018-11-27 16:06:37 +01:00
Ghostkeeper	41a5f05391	Remove SyncButton ... It hasn't been used now for a while. Contributes to issue CURA-5876.	2018-11-27 15:57:26 +01:00
Lipu Fei	2c8ed99281	Add is_experimental to Qt models and QMLs ... CURA-5879	2018-11-27 15:50:03 +01:00
Lipu Fei	c9c7ef7d67	Add "is_experimental" for experimental qualities ... CURA-5879	2018-11-27 15:50:02 +01:00
Mark	b98df0f22f	Show one website link where to get the material	2018-11-27 15:46:23 +01:00
Mark	f8f498b90c	Increase the lines that are shown to 12	2018-11-27 15:45:58 +01:00
Marijn Deé	fd4d1113b9	use right plural in variable name	2018-11-27 15:42:26 +01:00
Ghostkeeper	3ad2e4f62a	Re-use PrinterTypeLabel component and use abbreviated name ... Contributes to issue CURA-5876.	2018-11-27 15:24:58 +01:00
Ghostkeeper	c1bb1a9b98	Use normal font size for shorthand label ... This element had been designed when very_small was in the theme equal to default. I changed the entire application to use default instead of very_small and made very_small a smaller font, but didn't change that on the branch that this element was designed on. So now also change it here. Contributes to issue CURA-5876.	2018-11-27 15:12:44 +01:00
Ghostkeeper	55dd9be062	Move PrinterTypeLabel to a more central location ... So that we can re-use it in other places too. Contributes to issue CURA-5876.	2018-11-27 15:11:13 +01:00
Aleksei S	d47806de50	Change style, added close popitem close behaviour ... CURA-5941	2018-11-27 15:05:35 +01:00
Ghostkeeper	289399825b	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ... Conflicts: plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict. resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side. resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict. resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict. resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups. resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict. resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.	2018-11-27 15:01:48 +01:00
Jaime van Kessel	4fab546425	Fix codestyle issues ... Boyscouting	2018-11-27 15:00:57 +01:00
Diego Prado Gesto	92d0717096	Hide the toolbar and don't show time and material information when loading a gcode ... Contributes to CURA-5979.	2018-11-27 15:00:50 +01:00
Jaime van Kessel	352bfb15ce	Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into ui_rework_4_0	2018-11-27 14:55:07 +01:00
Mark	c7fd147f59	Show website for support	2018-11-27 14:55:06 +01:00
Jaime van Kessel	82ea562dc3	Add missing hoverEnabled property	2018-11-27 14:54:49 +01:00
Marijn Deé	172e003e1b	Removed the inital call to clusters	2018-11-27 14:53:23 +01:00
Diego Prado Gesto	077b34b433	Fix size of the extruder icon ... Now it should look the same in all places.	2018-11-27 14:49:01 +01:00
Marijn Deé	fb019ba987	In CloudOutputDeviceManager start a thread to periodically check for changes in the connected clusters	2018-11-27 14:48:47 +01:00
Ghostkeeper	0a71a9dd3e	Increase margins around configuration item ... As per the design. Contributes to issue CURA-5876.	2018-11-27 14:47:18 +01:00
Ghostkeeper	956741922d	Make elements retain their position if hotend or material is missing ... Just a space makes it keep the correct height. Contributes to issue CURA-5876.	2018-11-27 14:41:48 +01:00
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