16847 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ghostkeeper	dca286cea5	Give action button a sane default height ... We don't want to give it a default width since that should just adjust to its contents by default, which is fine. Contributes to issue CURA-5876.	2018-11-20 14:34:06 +01:00
Diego Prado Gesto	895590c3d0	Change the size of the progress bar control. Also add the rounded ... rectangle. Contributes to the new Cura UI-Flow.	2018-11-20 14:28:54 +01:00
Ghostkeeper	a1068a3ef2	Rename action_panel_button theme entry to action_button ... Because it's not just used in the save panel. Contributes to issue CURA-5876.	2018-11-20 14:24:09 +01:00
Ghostkeeper	42d73836f4	Move default margin by default to Cura's action buttons ... So we don't have to repeat that every time you create a new button. Contributes to issue CURA-5876.	2018-11-20 14:19:55 +01:00
Ghostkeeper	cbd5238738	Don't show custom/auto toggle buttons when not connected ... In order to prevent suddenly switching to the other side when the connection is lost or restored, we only evaluate this upon opening the popup. This way you might be surprised that closing and then opening it can show something else, but it will never surprise you while working on the popup itself as a user. Contributes to issue CURA-5876.	2018-11-20 13:55:28 +01:00
Ian Paschal	fb3cb67da0	Add printer configuration components ... Contributes to CL-1148	2018-11-20 13:46:41 +01:00
Diego Prado Gesto	fab0d5a4b7	Rename the color of the sidebar to main_background, since it was deleted ... but not updated in the usages. Contributes to CURA-5785.	2018-11-20 13:25:15 +01:00
Diego Prado Gesto	76f2aeb43c	Fix the title's top margin size in the add machine dialog.	2018-11-20 11:27:45 +01:00
Diego Prado Gesto	20285f26d6	Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu	2018-11-20 11:20:26 +01:00
Diego Prado Gesto	1844a9bed2	Merge branch 'master' into ui_rework_4_0	2018-11-20 11:08:05 +01:00
Lipu Fei	e6d9ad31ab	Use generated Makefiles to run tests	2018-11-20 09:53:17 +01:00
Ghostkeeper	a04db164e6	Make it possible to swap between auto and custom configuration ... We're going to need to make this disappear when the printer is not connected. But that is for later. Contributes to issue CURA-5876.	2018-11-19 17:11:51 +01:00
Ghostkeeper	16deeb0951	Remove old QuickConfigurationSelector ... It doesn't exist any more. Contributes to issue CURA-5876.	2018-11-19 17:10:29 +01:00
Jaime van Kessel	2b88e82a2a	Add option test-verbose build option to CuraTests	2018-11-19 16:52:02 +01:00
Ian Paschal	421a64c7b0	Replace queued print job cards with new design ... Contributes to CL-1148	2018-11-19 16:42:36 +01:00
Jaime van Kessel	10621aacee	Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu	2018-11-19 16:17:07 +01:00
Jaime van Kessel	8683a1e07e	Add previewStage to bundled cura package list ... CURA-5785	2018-11-19 16:16:41 +01:00
Ghostkeeper	00a49fff26	Rename QuickConfigurationSelector to ConfigurationMenu ... This is going to function as our main item for the configuration menu. It contains the part in the top bar and the glue item for the part in the popup. Contributes to issue CURA-5876.	2018-11-19 14:39:19 +01:00
Ghostkeeper	7a210087ff	Add header for configuration selector ... It currently always says 'Custom', but we will want to make that dynamic at some point. Contributes to issue CURA-5876.	2018-11-19 14:35:34 +01:00
Ghostkeeper	30b20b4aa5	Add borders to expandable components ... This adds a lining to all of the drop-downs from the stage menus. Contributes to issue CURA-5876.	2018-11-19 13:50:32 +01:00
Lipu Fei	b0f3fedc94	Fix import QtQuick versions to suit Qt 5.10 ... CURA-5785	2018-11-19 13:42:22 +01:00
Jaime van Kessel	a490e420f0	Prevent the setting items from being recreated every stage switch ... CURA-5785	2018-11-19 11:42:04 +01:00
Jaime van Kessel	6fe89e3d54	Fix width of simulationView component not being set correctly ... CURA-5785	2018-11-19 10:33:19 +01:00
Jaime van Kessel	e3ebf89092	Ensure that width of popup does not get set to 0 ... CURA-5785	2018-11-16 17:26:10 +01:00
Ghostkeeper	f10bd28c4a	Improve grammar and do similar fix for extruder end g-code ... Contributes to issue CURA-5906.	2018-11-16 17:25:32 +01:00
Jaime van Kessel	6b55490af8	Fix final QML warnings ... CURA-5785	2018-11-16 16:30:47 +01:00
Jaime van Kessel	bc5a2ce5b0	Make ViewSelector panel close upon selecting different view ... CURA-5785	2018-11-16 16:16:15 +01:00
Jaime van Kessel	52b2f4579a	Fix a number of QML warnings ... CURA-5785	2018-11-16 16:13:09 +01:00
Jaime van Kessel	7f99ed1af3	ExtruderIcon will now display that it's disabled correctly ... CURA-5785	2018-11-16 16:04:11 +01:00
Jaime van Kessel	d661a8e626	Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu	2018-11-16 15:23:38 +01:00
Jaime van Kessel	42399ecb24	Let headerItem fill entire component if no icon is set ... CURA-5785	2018-11-16 15:17:34 +01:00
Jaime van Kessel	b72f1bb314	Add missing screenScaleFactor for implicit sizes ... CURA-5785	2018-11-16 15:15:44 +01:00
Ghostkeeper	816d844258	Use textwidth instead of round ... CURA-5785 Co-Authored-By: nallath <nallath@gmail.com>	2018-11-16 15:14:08 +01:00
Jaime van Kessel	fe15a0a513	Made width of machineSelector popup depend on size of the element ... CURA-5785	2018-11-16 15:09:47 +01:00
Jaime van Kessel	5972bfaf03	Add round to minContentWidth ... This prevents text from getting a weird width CURA-5785	2018-11-16 15:06:21 +01:00
Jaime van Kessel	320efa443e	Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu	2018-11-16 14:58:47 +01:00
Jaime van Kessel	3fd1cc0e8c	Ensure that the added labels are also themable ... CURA-5785	2018-11-16 14:58:11 +01:00
Ghostkeeper	3ef6d0544a	Fix spelling and indents ... Ant-fuckery, as they say in the low lands. Contributes to issue CURA-5785.	2018-11-16 14:11:23 +01:00
Ghostkeeper	e087db7c2e	Code style and fixes to comments ... Contributes to issue CURA-5785.	2018-11-16 14:11:22 +01:00
Ghostkeeper	514fc13045	Remove redundant documentation ... CURA-5875 Co-Authored-By: nallath <nallath@gmail.com>	2018-11-16 14:04:33 +01:00
Ghostkeeper	81b6f3ab11	Update unclear qml ID's ... CURA-5785 Co-Authored-By: nallath <nallath@gmail.com>	2018-11-16 14:03:39 +01:00
Ghostkeeper	de020b4c75	Remove commented out code ... Co-Authored-By: nallath <nallath@gmail.com>	2018-11-16 14:02:00 +01:00
Ghostkeeper	e3dd5f1c39	Add documentation about qml z fix ... Co-Authored-By: nallath <nallath@gmail.com>	2018-11-16 13:59:51 +01:00
Jaime van Kessel	93bd5fee53	Fix wrong push free shadow for one at a time. ... It was applying the size twice. CURA-5822	2018-11-16 13:44:46 +01:00
Jaime van Kessel	240ac1f06b	Clarify some setting descriptions	2018-11-16 13:03:45 +01:00
Ghostkeeper	bee563f01b	Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu	2018-11-16 13:02:24 +01:00
Jaime van Kessel	401a6b5f8b	Merge pull request #4794 from fieldOfView/fix_adhesion_type_error ... Fix adhesion type error during startup	2018-11-16 11:24:29 +01:00
Aleksei S	846d608a03	Merge branch 'master' of github.com:Ultimaker/Cura	2018-11-15 15:59:00 +01:00
Aleksei S	2bf4354fed	Removed minimum_value for the setting support_roof_offset and support_bottom_offset ... CURA-5880	2018-11-15 15:57:34 +01:00
Ghostkeeper	d732a2f953	Merge branch 'master' into ui_rework_4_0	2018-11-15 15:55:08 +01:00