18 Commits

Author	SHA1	Message	Date
Jaime van Kessel	ed9634ebe0	Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite	2018-01-08 10:56:12 +01:00
Lipu Fei	d20895a055	Fix code style ... CURA-4758	2018-01-04 13:51:47 +01:00
Lipu Fei	84adbc5f41	Use the 5.8 versions of QtQuick modules in QMLs ... CURA-4758	2018-01-04 13:26:14 +01:00
ChrisTerBeke	4cec27b181	Fix QML warnings for combo boxes - CURA-4758	2018-01-04 11:53:34 +01:00
ChrisTerBeke	4f77b2ea6d	More layout and font fixes	2018-01-03 13:50:06 +01:00
ChrisTerBeke	b7aadbe3c3	Fix extruder dropdown text model	2018-01-03 13:08:20 +01:00
ChrisTerBeke	1fa3031486	Fix text color for extruder comboboxes	2018-01-03 12:52:40 +01:00
ChrisTerBeke	3a2b2d3333	Also fix combobox list item heights for extruder dropdowns	2018-01-03 12:48:33 +01:00
ChrisTerBeke	77c8ac3950	Layout fixes for controls 2.0	2018-01-03 11:46:20 +01:00
Jaime van Kessel	799d1a5b0c	Updated setting items & sidebar to qtQuick controls 2.0	2017-10-11 21:02:27 +02:00
Mark	9a193ad5c5	Changing AGPLv3 to LGPLv3	2017-09-28 13:00:43 +02:00
fieldOfView	c5fd0e6c80	Use screenScaleFactor to consistently adapt sizes to display pixel ratio	2017-09-25 22:07:12 +02:00
Lipu Fei	aad628a46f	Change to new design for extruder number settings ... CURA-4211	2017-08-31 17:49:24 +02:00
fieldOfView	0f9cfa0304	Fix tab order after expanding categories or using search ... This reimplements the behavior of pressing tab/backtab to force the correct order of items in the listview.	2017-06-26 14:35:37 +02:00
fieldOfView	edee53b0b1	Scroll setting with active focus into view	2017-06-26 13:00:59 +02:00
fieldOfView	b324e90ba5	Show hover state on active focus	2017-06-22 18:33:30 +02:00
Jaime van Kessel	5aba1731f5	Renamed useOptionalExtruder to addOptional extruder ... This is more in line with the other properties CURA-3814	2017-05-22 14:05:10 +02:00
Jaime van Kessel	20cb3ea01f	Added "optional_extruder" setting type ... CURA-3814	2017-05-22 13:24:41 +02:00