7 commits

Author	SHA1	Message	Date
Daniel Schiavini	a1c252d3a2	Revert "Revert "fix merge conflict"" ... This reverts commit 4bffa6d90f.	2018-12-07 10:25:46 +01:00
Daniel Schiavini	4bffa6d90f	Revert "fix merge conflict" ... This reverts commit ec03b012a7, reversing changes made to 2af33738d1.	2018-12-07 10:22:32 +01:00
Ghostkeeper	4d87c46423	Remove sourceSize.width: width from all RecolorImages ... It is now the default in Uranium. Contributes to issue CURA-5876.	2018-12-04 15:04:51 +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
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
Jaime van Kessel	54685c983a	Make PrintSetupSelector use layout instead of fixed width ... This makes the components autoscale a bit when needed. CURA-5785	2018-11-12 13:29:21 +01:00
Jaime van Kessel	ca63733827	Updated header of the settingbar ... CURA-5785	2018-11-12 13:06:12 +01:00