17731 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Diego Prado Gesto	47626f6033	Fix the color and proportions of the cura logo in the about panel	2018-12-06 11:57:55 +01:00
Diego Prado Gesto	1d877cbade	Merge branch 'ui_rework_4_0' into small_ui_fixes	2018-12-06 11:47:29 +01:00
Diego Prado Gesto	26a41c3726	Adjust the color of the printer in the printer selector ... For that I needed to get rid of the IconLabel component, since in this case the color of the icon and the text is the same (and it makes sense)	2018-12-06 11:45:14 +01:00
Diego Prado Gesto	aab61ce8da	Modify the header pattern to be have an empty space in the left and bottom, so when repeating the pattern it doesn't overlap.	2018-12-06 11:35:33 +01:00
Diego Prado Gesto	f655e6c43e	Add a pattern in the background of the header. ... Adjust some main colors to the ones in the designs.	2018-12-06 11:30:59 +01:00
Ghostkeeper	48e15daf64	Fix height of scroll view and make scrollable ... Contributes to issue CURA-5876.	2018-12-06 11:16:42 +01:00
Lipu Fei	109586f69c	Merge remote-tracking branch 'origin/ui_rework_4_0' into CURA-5941_restyle_setting_dropdown	2018-12-06 11:09:26 +01:00
Lipu Fei	f7f3c96f81	Fix typo ... CURA-5941	2018-12-06 10:53:43 +01:00
Jaime van Kessel	2602d5bf02	Add changed checks to prevent unneeded signals from being fired ... CURA-6006	2018-12-06 10:46:19 +01:00
Jaime van Kessel	6a466c99b2	Make the progressButton use signals instead of functions ... Although the naming is still a bit off, it's much cleaner to use signals instead of functions. It's also more in line with how default QML components handle these kind of situations CURA-6006	2018-12-06 09:54:32 +01:00
Jaime van Kessel	838949dac7	Moved qml pages of toolbox to a loader ... This dramatically improves the loading of the toolbox dialog CURA-6006	2018-12-06 09:45:27 +01:00
Diego Prado Gesto	b0c3a4e17a	Align the additional components to the right of the job specs ... The model checker now shows centered	2018-12-06 09:25:31 +01:00
Diego Prado Gesto	c757bf128e	Adjust colors and alignments in the print info panel	2018-12-06 09:12:43 +01:00
Jaime van Kessel	00e95e68eb	Removed unneeded Marketplace tag in logging ... The logger does that all by itself already. CURA-6006	2018-12-05 14:26:47 +01:00
Diego Prado Gesto	218fa3aded	Align the print info to the left	2018-12-05 14:22:04 +01:00
Ghostkeeper	5ba8820f18	Remove unnecessary setting height to 0 when invisible ... Turns out that it doesn't count for the childrenRect.height anyway when the item is invisible. Contributes to issue CURA-5876.	2018-12-05 14:10:51 +01:00
Jaime van Kessel	d6630b6881	Removed some more cases where data was duplicated and re-used for different purposes ... CURA-6006	2018-12-05 14:09:55 +01:00
Diego Prado Gesto	a2587aca59	Merge branch 'ui_rework_4_0' into place_print_info_back	2018-12-05 14:05:38 +01:00
Jaime van Kessel	a52f866f81	Move most models out of dictionary ... CURA-6006	2018-12-05 14:03:32 +01:00
Diego Prado Gesto	07d58c3aef	Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown	2018-12-05 13:56:21 +01:00
Jaime van Kessel	07d210483c	Greatly decrease the bloat / complexity of the toolbox ... There was a lot of stuff going on that didn't need to happen, so I cut those parts out in order to improve the overview.	2018-12-05 13:42:13 +01:00
Diego Prado Gesto	0e22f6b672	Fix an issue that caused a non-deterministic segfault ... Also add a topMargin only when there are tabs in the custom print setup. Contributes to CURA-5941.	2018-12-05 13:30:01 +01:00
Ghostkeeper	024bf409c9	Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0	2018-12-05 13:29:06 +01:00
Diego Prado Gesto	5b57e6bf30	Code style in JobSpecs	2018-12-05 13:24:34 +01:00
Jaime van Kessel	b1440737e6	Remove a whole bunch of unused code ... CURA-6006	2018-12-05 13:21:17 +01:00
Diego Prado Gesto	909b0f3f7e	Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown	2018-12-05 13:10:42 +01:00
Diego Prado Gesto	537929893f	Merge branch 'master' into ui_rework_4_0	2018-12-05 13:10:14 +01:00
Diego Prado Gesto	034b1660f7	Adjust sizes in the custom print setup mode ... Contributes to CURA-5941.	2018-12-05 13:05:22 +01:00
Ian Paschal	e8a933331c	Clean-up printer status label ... Contributes to CL-1153	2018-12-05 12:14:18 +01:00
Jaime van Kessel	abcc621cc6	Added missing typing	2018-12-05 11:29:44 +01:00
Jaime van Kessel	d9135ac72f	Fix more codestyle issues ... CURA-6006	2018-12-05 11:06:14 +01:00
Jaime van Kessel	978a01e4c8	Fix typing & codestyle ... CURA-6006	2018-12-05 10:51:05 +01:00
Jaime van Kessel	700ae4bebb	Removed super spammy logging ... CURA-6006	2018-12-05 10:48:06 +01:00
Jaime van Kessel	325137db83	Merge pull request #4888 from Ultimaker/CURA-5982_fix_crash_no_material ... CURA-5982 Return empty material model for empty material	2018-12-05 10:43:31 +01:00
Ghostkeeper	5d95d11437	Use setCurrentIndex to switch tabs at activeExtruderChanged ... This fixes a mysterious segfault. We still don't know why the segfault occurred though. All we know is that QML logs something about a binding loop on currentIndex, and Qt logs something about removing range [-1 through 0] from VisualItemModel. When the tab bar is then made visible, Cura crashes. It is a nondeterministic crash. After this change, we are not seeing it any more (but with any nondeterministic bug, it's hard to verify that it was actually fixed). Contributes to issue CURA-5876.	2018-12-05 09:52:43 +01:00
Diego Prado Gesto	cdb8020029	Add another expandable component ... Use one of them if the drop-panel has to act as a Popup and the other if it has to act as a standard component. Contributes to CURA-5941.	2018-12-05 09:39:04 +01:00
Jaime van Kessel	a62da4e523	Use setCurrentIndex instead of direct assignment ... This should prevent the binding from breaking and hopefully the segfault CURA-5876	2018-12-05 09:13:48 +01:00
Lipu Fei	4ff5e43a28	Handle Empty and Unknown material cases ... CURA-5982	2018-12-04 17:24:51 +01:00
Lipu Fei	fb3c1fc11d	Merge remote-tracking branch 'origin/master' into CURA-5982_fix_crash_no_material	2018-12-04 17:15:26 +01:00
Lipu Fei	a13fb4a81e	Merge remote-tracking branch 'origin/master' into ui_rework_4_0	2018-12-04 17:12:24 +01:00
Ghostkeeper	780e5e1691	Fix binding loop in PrintCoreConfiguration ... Contributes to issue CURA-5876.	2018-12-04 17:09:55 +01:00
Ghostkeeper	1544ab6cf0	Explicitly enable hover on ConfigurationItem ... Apparently the default for this depends on some system setting. In Nallath's computer that system setting makes it false by default for some reason. Contributes to issue CURA-5876.	2018-12-04 17:07:59 +01:00
Ghostkeeper	de78c44461	Fix configuration drop-down for dark theme ... This actually changes the secondary colour to be darker for the dark theme, to be more in line with the general theme then. Contributes to issue CURA-5876.	2018-12-04 16:43:13 +01:00
Jaime van Kessel	fd6a8d7642	Merge branch 'master' of github.com:Ultimaker/Cura	2018-12-04 15:47:27 +01:00
Jaime van Kessel	b2238420fb	Ensure that reset always correctly gets set to basic ... The old code that simply resetted the preferences was still active, but this could cause a race condition in some situations. In those cases it would first set it to basic and then clear the preferences (thus resulting in no settings being visible) CURA-5981	2018-12-04 15:46:13 +01:00
Simon Edwards	39c282fabe	Merge pull request #4925 from Ultimaker/CL-1153_printer_states_in_monitor ... CL-1153 printer states in monitor	2018-12-04 15:30:12 +01:00
Ghostkeeper	b5bb3232f3	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ... Conflicts: resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.	2018-12-04 15:21:36 +01:00
Ghostkeeper	9c75f3fe0f	Merge branch 'CURA-5876-Configuration_dropdown' of ssh://github.com/Ultimaker/Cura into CURA-5876-Configuration_dropdown	2018-12-04 15:19:48 +01:00
Ian Paschal	014a138fda	Remove semi-colon ... Contributes to CL-1153	2018-12-04 15:12:00 +01:00
Ian Paschal	1494daf671	Simplify preview icon logic ... Contributes to CL-1153	2018-12-04 15:11:31 +01:00