3 Commits

Author	SHA1	Message	Date
Ghostkeeper	9ea418c0a1	Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7"" ... This reverts commit 28f4d8513db7efce17bfd8b80fa7c8b237fd1c18. The original revert was to revert an accidental merge from master to 4.7. This now reverts the revert on Master, so that we still have those changes on Master.	2020-08-20 16:35:52 +02:00
Ghostkeeper	28f4d8513d	Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7" ... This reverts commit 7f47f12bf0a9cf305542b6c21600ce9b804c1dfd, reversing changes made to dd42c87da762d2030ee2220bc6f0a3e44cf85c28.	2020-08-20 16:01:46 +02:00
Kostas Karmas	4e20c7dddc	Rework the open project dialog to contain only 1 dropdown ... With the caveat that the qtQuickControls had to be updated to 2.3, due to a qt bug in 1.x that did not update the dropdown popup list according to the ListModel. This leads to a different look in the dropdowns and in the buttons of the open project dialog, compaired to the rest of the application. CURA-7609	2020-08-04 16:33:11 +02:00