60 Commits

Author	SHA1	Message	Date
Nino van Hooff	b182830c21	Add tooltips for intent profiles to the Custom Quality panel. ... The description is optional. Tooltip will not show if no description is set CURA-6853	2019-10-17 17:17:06 +02:00
Remco Burema	fde4804a58	Merge branch 'master' into CURA-6862_truncate_profile_names	2019-10-15 11:48:08 +02:00
Remco Burema	71701f15cf	Remove function to reintroduce binding. ... Also force max width to integer value and comment why there is a plain value like 0.7 in the code. part of CURA-6862	2019-10-15 11:38:51 +02:00
Lipu Fei	8f66809159	Always show custom qualities ... CURA-6882	2019-10-14 14:34:35 +02:00
Nino van Hooff	279d5671d8	Cleanup CustomPrintSetup.qml ... CURA-6862	2019-10-14 12:14:31 +02:00
Nino van Hooff	c147174668	Limit profile name to 70% of available width for CustomPrintSetup ... This leaves 30% for the variant detail info CURA-6862	2019-10-14 11:05:24 +02:00
Lipu Fei	8940097265	Separate black and grey text for quality menu ... CURA-6846	2019-10-07 21:35:31 +02:00
Ghostkeeper	e5c0812acc	Fix scrolling through profiles on Qt5.12+ ... Contributes to issue CURA-6843.	2019-10-04 16:22:34 +02:00
Lipu Fei	c528000268	Add activeQualityDisplayName to remove code duplication ... CURA-6846	2019-10-04 14:26:20 +02:00
Jaime van Kessel	5bd5875a20	Also add intent warning to custom print setup ... CURA-6601	2019-10-04 10:39:02 +02:00
Lipu Fei	61a1b61756	Remove unnecessary activeQualityName property ... CURA-6846	2019-10-04 10:27:39 +02:00
Jaime van Kessel	4793c77380	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent	2019-10-04 09:39:47 +02:00
Jaime van Kessel	f8951e4140	Add scrollbar to profile dropdown ... CURA-6843	2019-10-04 09:39:26 +02:00
Lipu Fei	bd84c4d98d	Show quality and intent a custom profile is based on ... CURA-6846	2019-10-03 14:18:51 +02:00
Lipu Fei	26b523f190	Fix quality profile menu size ... CURA-6838	2019-10-03 12:37:11 +02:00
Lipu Fei	2d59271a69	Remove hard-coded height	2019-10-03 12:28:07 +02:00
Jaime van Kessel	ff3837bac5	Only show "Custom Profile" header if there are custom profiles ... CURA-6844	2019-10-02 16:48:57 +02:00
Jaime van Kessel	c6850b4f73	Set right text color if menubutton is disbled ... CURA-6848	2019-10-02 16:39:50 +02:00
Lipu Fei	e5d94fd2e4	Change to "name" property ... CURA-6599	2019-09-26 17:19:15 +02:00
Jaime van Kessel	b72b542d21	Add missing font & color ... CURA-6810	2019-09-26 12:55:14 +02:00
Lipu Fei	9ced5e9205	Fix QObject segfaults in QML ... CURA-6599	2019-09-25 14:38:38 +02:00
Lipu Fei	f395c92732	Fix custom profile menu ... CURA-6599	2019-09-25 08:28:24 +02:00
Lipu Fei	f2e518da6b	Fix code style and typing	2019-09-25 08:23:57 +02:00
Jaime van Kessel	84e5114566	Fix minor review comments ... CURA-6598	2019-09-18 14:17:26 +02:00
Jaime van Kessel	fade8d3644	No longer make border width hardcoded ... CURA-6598	2019-09-18 14:10:52 +02:00
Ghostkeeper	2d0a122c2d	Display list of custom quality profiles ... If you activate any of them from here though, it'll crash. Contributes to issue CURA-6598.	2019-09-12 15:13:02 +02:00
Jaime van Kessel	423b4ad869	Fix binding loop ... CURA-6598	2019-09-04 17:16:07 +02:00
Jaime van Kessel	994e0e53cc	Switch the anchors to paddings ... Otherwise the bottomb button would extend from the popup. CURA-6598	2019-09-04 16:54:35 +02:00
Jaime van Kessel	53aaaab891	Add a topMargin for the qualities menu ... CURA-6598	2019-09-04 16:43:59 +02:00
Jaime van Kessel	2dbfbecd12	Ensure that show/hide behavior of the qualities intent menu is correct ... It would previously blink if you pressed the button, as a click outside would hide it due to close policy, but a mouse release would show it again (as it's hidden and that's what the on clicked of the button did) CURA-6598	2019-09-04 16:37:10 +02:00
Jaime van Kessel	c2225c9afc	Merge branch 'feature_intent_interface' of github.com:Ultimaker/Cura into feature_intent_interface	2019-09-03 11:27:38 +02:00
Jaime van Kessel	ac0c7fd4d6	Remove unused properties ... CURA-6598	2019-09-03 11:27:11 +02:00
Lipu Fei	52f3f9b773	Update QML import versions and add headings ... CURA-6598	2019-09-03 11:17:20 +02:00
Lipu Fei	0926c223b2	Add missing renderType: Text.NativeRendering ... CURA-6598	2019-09-03 10:53:53 +02:00
Jaime van Kessel	c7b6133e3d	Some UI polishing ... CURA-6598	2019-08-29 11:53:25 +02:00
Jaime van Kessel	7c832e7ea3	Intents are now also displayed in active profile labels ... CURA-6598	2019-08-29 11:53:25 +02:00
Jaime van Kessel	4520ee7e1c	Added rounded corners to the intent menu ... CURA-6598	2019-08-29 11:53:25 +02:00
Jaime van Kessel	0891abf8af	Fix hover & highlighting for the qualities& intent menu ... CURA-6598	2019-08-29 11:53:25 +02:00
Jaime van Kessel	5ab31df738	Add hover effect to quality/intent selector ... CURA-6598	2019-08-29 11:53:25 +02:00
Jaime van Kessel	210a2aa6bb	Add arrow indicator to the custom print setup ... CURA-6598	2019-08-29 11:53:25 +02:00
Jaime van Kessel	d5bbc3f205	Remove reference to unknown component ... CURA-6598	2019-08-29 11:53:25 +02:00
Jaime van Kessel	f7e6f22e6c	Fix typo ... CURA-6598	2019-08-29 11:53:25 +02:00
Jaime van Kessel	5acc3111e0	Some minor UI fixes ... CURA-6598	2019-08-29 11:53:25 +02:00
Jaime van Kessel	6751dc4fc8	Remove unused QML component ... CURA-6598	2019-08-29 11:53:25 +02:00
Jaime van Kessel	92be261178	Update the profile selector to new style for the intents ... CURA-6598	2019-08-29 11:53:25 +02:00
Jaime van Kessel	35ec70a3cf	Add a selector for the intent profile ... CURA-6534	2019-06-05 11:13:32 +02:00
Lipu Fei	d97b812ccd	Merge branch '4.0' into unify_font_types	2019-01-03 10:46:49 +01:00
Ghostkeeper	cf6cce5df0	Make 'Profile' text larger ... As per the design. Contributes to issue CURA-6025.	2018-12-31 14:00:39 +01:00
Ghostkeeper	c6f4cb4927	Make the settings panel resizable ... You can now drag the bottom side of the panel to make it bigger or smaller. Contributes to issue CURA-6054.	2018-12-24 15:31:47 +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