3315 Commits

Author	SHA1	Message	Date
Ghostkeeper	d42ddad606	Add icons on left and right side of text ... For this I had to implement functionality in ActionButton to be able to display the icon on either side. Contributes to issue CURA-5876.	2018-11-20 14:47:41 +01:00
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
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
Diego Prado Gesto	76f2aeb43c	Fix the title's top margin size in the add machine dialog.	2018-11-20 11:27:45 +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
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	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	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
Jaime van Kessel	6dd6f5ecc7	Made the hardcoded values of ExpandableComponent themable ... CURA-5785	2018-11-15 14:11:46 +01:00
Jaime van Kessel	3629e3b604	Added highlight to ExpandableComponent ... CURA-5785	2018-11-15 14:04:52 +01:00
Jaime van Kessel	eca9820fc4	Add toggle function to expandable popup ... Also ensures that the machineSelector closes the popup on making a choice CURA-5785	2018-11-15 13:55:33 +01:00
Jaime van Kessel	f0b8c1e611	Fix some minor display issues ... CURA-5785	2018-11-15 09:45:46 +01:00
Jaime van Kessel	c08aa2205c	Fix enabled checkbox for extruder selection ... CURA-5785	2018-11-15 09:37:54 +01:00
Jaime van Kessel	21d7619a45	Added a hover effect to the expandableComponent ... CURA-5785	2018-11-14 16:57:05 +01:00
Jaime van Kessel	c27f51d944	Make the view selector also use the expandableComponent ... CURA-5785	2018-11-14 16:44:36 +01:00
Jaime van Kessel	429a49aa2e	Make the default size of the expandableComponent icon depend on the height of the element ... This is a way more sensible default. CURA-5785	2018-11-14 14:06:55 +01:00
Jaime van Kessel	7ca3490097	Make the collapse arrows consistent with the rest of the UI ... CURA-5785	2018-11-14 14:00:19 +01:00
Jaime van Kessel	878b743232	Add elide to machine selector label. ... CURA-5785	2018-11-14 10:39:03 +01:00
Jaime van Kessel	c35b4f1d31	Removed old unusued code ... CURA-5785	2018-11-14 10:00:44 +01:00
Jaime van Kessel	fb72f9a059	Fixed size of expandableItem not being the correct width ... CURA-5785	2018-11-14 09:59:56 +01:00
Jaime van Kessel	1569fd7396	Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu	2018-11-14 09:34:08 +01:00
Ghostkeeper	4b8d20cad7	Correct the link to create a new account ... Previously this button just took you to the log-in page. Fixes issue CURA-5921.	2018-11-13 16:27:19 +01:00
Ghostkeeper	266e08fdff	Merge branch 'master' into ui_rework_4_0 ... Conflicts: plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky. resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.	2018-11-13 16:23:36 +01:00
Jaime van Kessel	c9389dd9ab	Codestyle fixes	2018-11-13 15:58:34 +01:00
Jaime van Kessel	785c2661a2	Make SimulationViewMenuComponent also use the ExpandableComponent ... CURA-5785	2018-11-13 15:57:00 +01:00
Jaime van Kessel	deb5fd1926	Fix PrintSetupSelector for previewStage ... CURA-5785	2018-11-13 15:35:05 +01:00
Jaime van Kessel	c18b8241f5	Change MachineSelection so that it also uses the ExpandableComponent ... CURA-5785	2018-11-13 14:00:00 +01:00
Jaime van Kessel	fe4ed46496	Show material name instead of just color ... CURA-5785	2018-11-12 16:55:42 +01:00
Jaime van Kessel	4c1a45f904	Added sizes to the stage menu ... This isn't themed, but right now it does adhere to the sizes I got from UX CURA-5785	2018-11-12 15:53:09 +01:00
Ghostkeeper	bfe5ae6f9c	Merge branch '3.6'	2018-11-12 15:48:22 +01:00
Ghostkeeper	fe66d15b9e	Disable Polish language ... The translation didn't arrive in time for the 3.6 release. Contributes to issue CURA-5870.	2018-11-12 15:47:42 +01:00
Jaime van Kessel	783fe9ab73	Updated the look of the extruder buttons ... CURA-5785	2018-11-12 15:23:58 +01:00