17482 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Lipu Fei	6992fd2991	Update plugin versions to match package versions ... CURA-6019	2018-12-17 13:03:21 +01:00
Ghostkeeper	8d6a281070	Increment SDK version in bundled packages file ... And increment the version number of every package. Contributes to issue CURA-6019.	2018-12-17 09:58:38 +01:00
Ghostkeeper	c235f339ae	Increment API version to 6 ... All plug-ins now have to re-check whether they are still compatible with the current version of Cura. Contributes to issue CURA-6019.	2018-12-14 17:29:02 +01:00
Jaime van Kessel	ef6f666c3e	Remove duplicate alias definition ... Yay. Merges.	2018-12-14 16:41:07 +01:00
Ian Paschal	38ca23a22f	Merge pull request #4997 from Ultimaker/prevent_monitor_stage_overlap ... Quick fix to prevent monitor stage from overlapping header	2018-12-14 16:29:39 +01:00
Ghostkeeper	78a5f95c43	Merge branch 'CURA-5876_fixes' into 4.0	2018-12-14 16:28:04 +01:00
Ian Paschal	74af11d609	Anchor loader to stage menu vertical center	2018-12-14 16:20:08 +01:00
Ian Paschal	ffccbcea2f	Anchor to bottom of header background	2018-12-14 16:13:49 +01:00
Ian Paschal	2789a0fdc4	Revert "Quick fix to prevent monitor stage from overlapping header" ... This reverts commit 3766effa81dc111d70c0d7ff4563936ec92fc5c4.	2018-12-14 16:13:35 +01:00
Ian Paschal	3766effa81	Quick fix to prevent monitor stage from overlapping header	2018-12-14 16:04:31 +01:00
Ghostkeeper	2e835bf48d	Merge branch '4.0'	2018-12-14 15:02:30 +01:00
Ghostkeeper	3a74511d23	Remove padding from views selector ... This padding made it break the height of the item for some reason. I guess that is a Qt bug. In any case, the padding shouldn't be there either since the lining is on the inside of the child buttons so the padding only causes a gap to appear on the left and right sides, which looks weird. Contributes to issue CURA-6029.	2018-12-14 15:02:14 +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
Ghostkeeper	64e436f814	Merge branch '4.0'	2018-12-14 13:27:54 +01:00
Ghostkeeper	475b008310	Reduce minimum window size slightly ... This way it just fits on the screen of a 13 inch MacBook Air.	2018-12-14 13:27:36 +01:00
Jaime van Kessel	c4a0f19d56	Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0	2018-12-14 13:23:43 +01:00
Jaime van Kessel	d379f94775	Make the dark theme a bit more readable	2018-12-14 13:23:28 +01:00
Ghostkeeper	a010823a4e	Fix warning when active stage is not yet instantiated ... Edit: Originally this was more or less the same fix as what Diego just did at the same time, which caused a merge conflict, but I think my solution is more elegant than the ternary operator that was originally there so I'm keeping mine.	2018-12-14 13:22:32 +01:00
Ghostkeeper	8a4a1c9d49	Don't let print info take space if invisible ... This way there is a little bit more space for the text 'No time estimation available', which was previously abbreviated to 'No time estimation availa...'.	2018-12-14 13:21:00 +01:00
Lipu Fei	a02bccf74d	Fix NozzleModel to work with new ListModel data update ... CURA-6015 ListModels should not modify items directly. All ListModels should use setItems() and the insertions/removals/modifications will be done in setItems() itself.	2018-12-14 13:00:06 +01:00
Jaime van Kessel	c3aca8907c	Fix extruder number not being visible in dark theme	2018-12-14 12:02:52 +01:00
Jaime van Kessel	6a3ac99551	Ensure that all icons use the same color from theme. ... Also added some fixes for the dark theme	2018-12-14 11:59:22 +01:00
Lipu Fei	cd3a9e02d6	Merge remote-tracking branch 'origin/4.0' into CURA-6015_fix_osx_crash	2018-12-14 11:45:51 +01:00
Jaime van Kessel	15cd2a9269	Changed textColor of recommended infill slider text to be themed. ... This is required to make the dark theme work correctly	2018-12-14 11:36:40 +01:00
Jaime van Kessel	5e4e52e6fc	Fix blue square being shown in selector if no icon is set ... CURA-5876	2018-12-14 11:09:48 +01:00
Jaime van Kessel	8f04316ef8	Merge branch '4.0' of github.com:Ultimaker/Cura	2018-12-13 19:40:59 +01:00
Jaime van Kessel	9d929b90c3	Merge branch 'master' of github.com:Ultimaker/Cura	2018-12-13 19:40:51 +01:00
Aleksei S	8dc2a41fb7	Typo, wrong item type, "item" ... CURA-5941	2018-12-13 17:27:16 +01:00
Jaime van Kessel	8f278fe938	Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0	2018-12-13 17:21:35 +01:00
Jaime van Kessel	856c1dcb20	Also disconnect the signal for the old parent of printSetupSelector	2018-12-13 17:21:07 +01:00
Diego Prado Gesto	473160a102	Add a check for null to avoid warnings in the logs.	2018-12-13 17:02:13 +01:00
Ghostkeeper	bb45680b98	Merge branch '4.0'	2018-12-13 16:49:57 +01:00
Ghostkeeper	3d4da94b36	Remove obsolete description detail about old Cura versions ... This setting had a detail in the description about how the setting used to behave in old Cura versions. Let's remove it since it is not relevant any more. Fixes #4536.	2018-12-13 16:49:45 +01:00
Diego Prado Gesto	d435f21193	Merge pull request #4986 from Ultimaker/CURA-6028_preview_stage_doesnt_switch ... Cura 6028 preview stage doesnt switch	2018-12-13 16:47:22 +01:00
Diego Prado Gesto	012ee0c02a	Use the MouseArea trick to assure that the binding still works for the ... checked property of the button. Contributes to CURA-6028.	2018-12-13 16:44:49 +01:00
Jaime van Kessel	bd565bf4cf	Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0	2018-12-13 16:33:46 +01:00
Ghostkeeper	3f3cd5e334	Remove broken load of PrepareSidebar.qml ... This file no longer exists. Loading it gives a warning.	2018-12-13 16:32:49 +01:00
Jaime van Kessel	d48e89e224	Prevent the parent of printSetupSelector from being set to null ... If it's parent gets set to null it will break the focus, which we need for the binding updates. CURA-5941	2018-12-13 16:32:48 +01:00
alekseisasin	70e60e5313	Merge pull request #4981 from Ultimaker/fix_output_device_selector ... Change the behaviour of the output device selector	2018-12-13 16:21:49 +01:00
Jaime van Kessel	1b3cb32334	Fix the simulation view not being selected as default ... CURA-6028	2018-12-13 15:59:15 +01:00
Diego Prado Gesto	b48eedfb80	Modify color for the progress bar in the messages.	2018-12-13 15:15:22 +01:00
Diego Prado Gesto	0d780e61ff	Merge branch '4.0' into CURA-5876_fixes	2018-12-13 14:39:11 +01:00
Jaime van Kessel	8091b2810c	Apply suggestions from code review ... Change some margins for the corresponding absolute values instead of adding formulas. Contributes to CURA-5876. Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>	2018-12-13 14:36:58 +01:00
Diego Prado Gesto	aa2fa371c4	Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0	2018-12-13 14:32:28 +01:00
Diego Prado Gesto	17f0c12858	Make the middle component to have zero width if there is no component to ... fill the gap. Contributes to CURA-6020.	2018-12-13 14:31:34 +01:00
Jaime van Kessel	c4700b2752	Also update the model if the data changed ... CURA-6028	2018-12-13 14:30:00 +01:00
Jaime van Kessel	a1a9b058f5	Let header listen to activeStageId instead of the model ... CURA-6028	2018-12-13 14:28:32 +01:00
Lipu Fei	8021c8e449	Fix errors in SettingOptionalExtruder.qml ... CURA-6015	2018-12-13 14:12:51 +01:00
Lipu Fei	d879cab91a	Add all fields for optional extruder in ExtruderModel ... CURA-6015	2018-12-13 14:12:44 +01:00
Lipu Fei	df0b1c6c77	Fix ExtruderManager creation in MachineManager ... CURA-6015	2018-12-13 14:12:38 +01:00