8609 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jack Ha	765ddefd7f	Reverse lookup TypeIndexMap is now also a dict. CURA-3497	2017-04-24 16:09:00 +02:00
Ghostkeeper	e7157e9e6d	Merge branch 'gcode-keywords' of https://github.com/alephobjects/Cura2 into alephobjects-gcode-keywords	2017-04-24 15:35:10 +02:00
Jaime van Kessel	01f33d3f28	Merge pull request #1732 from Ultimaker/feature_extruder_contextmenu ... Add Extruders to Context Menu and Refactor	2017-04-24 14:55:57 +02:00
Ghostkeeper	2eae1cdf22	Move support roof settings above support bottom settings ... This was deemed the most logical ordering. Contributes to issue CURA-3491.	2017-04-24 14:28:10 +02:00
fieldOfView	57f936e5ff	Remove definition_changes containers when a stack is removed	2017-04-24 13:56:37 +02:00
fieldOfView	8b5ac81404	Fix extruder_stack global values are moved to ... ExtruderManager.getMachineExtruders() result is not sorted, the result of getActiveExtruderStacks() is	2017-04-24 13:20:20 +02:00
Arjen Hiemstra	bca27ad11f	Document findItemIndex function in ContextMenu	2017-04-24 13:13:00 +02:00
Arjen Hiemstra	27256cae9e	Revert import change	2017-04-24 13:12:36 +02:00
Arjen Hiemstra	8c4ec804e7	Add type hinting to _onContextMenuRequested	2017-04-24 13:12:21 +02:00
Arjen Hiemstra	78603bed63	Rename setSelectionExtruder to setExtruderForSelection ... This matches more closely with the naming of the other selection actions.	2017-04-24 13:12:00 +02:00
Arjen Hiemstra	e571b8aeac	Remove superfluous return statement	2017-04-24 13:11:16 +02:00
fieldOfView	3e9fdb5db1	Prevent the DiscardOrKeepProfileChangesDialog from popping up (twice) if there are user changes	2017-04-24 13:11:10 +02:00
Arjen Hiemstra	49bdb78219	Use cura. for imports instead of relative imports` ... Matches the style of the rest of the file.	2017-04-24 13:11:04 +02:00
Jaime van Kessel	fb0df3109c	Fixed inhertiance manager getting update from a Category setting	2017-04-24 13:10:33 +02:00
Jaime van Kessel	2297a6e80b	Fixed inhertiance manager crashing if there is no parent	2017-04-24 13:05:39 +02:00
fieldOfView	fab0fa1dde	Move setting values that are settable per extruder from/to global stack when setting extruder count	2017-04-24 12:58:20 +02:00
MaukCC	dff23b0e82	Update cartesio_0.8.inst.cfg	2017-04-24 11:06:34 +02:00
fieldOfView	c1fa927118	Make the general settings page options draggable only in the vertical direction ... ... to match other scrollviews. Fixes #1723	2017-04-22 23:07:13 +02:00
fieldOfView	d2d36b8c98	Lower extruder_nr settings when they exceed the number of extruders	2017-04-22 12:17:16 +02:00
fieldOfView	2ca24ba7e6	Restore both material and variant to match 1st extruder when switching to single extrusion	2017-04-22 11:20:55 +02:00
fieldOfView	8d42f9c187	Move some convoluted logic from QML into Python	2017-04-22 10:13:58 +02:00
fieldOfView	933ee408e4	Code style	2017-04-22 09:47:00 +02:00
fieldOfView	0966ef5338	Fix QML warnings when switching to an extruder tab	2017-04-21 21:48:20 +02:00
fieldOfView	656e7a8046	Change the scope of the head polygon functions to be inside the main tab	2017-04-21 21:27:15 +02:00
fieldOfView	ba229444b7	Pause autoslicing while the MachineSettingsAction is open ... Each setting-change would cause a reslice, which is unnecessary.	2017-04-21 21:05:28 +02:00
fieldOfView	4d12ab1296	Merge branch 'master' into feature_multiextruder_machinesettings	2017-04-21 19:31:44 +02:00
Ghostkeeper	2fda85a6aa	Hide estimated time left if print is aborted or completed ... In fact, only show it if a time estimate is meaningful. We keep showing the estimate while a print is paused though. Contributes to issue TRI-1550.	2017-04-21 14:29:40 +02:00
Ghostkeeper	fb674ec135	Merge remote-tracking branch 'origin/master'	2017-04-21 14:28:22 +02:00
MaukCC	36eb3579a9	Update cartesio_global_High_Quality.inst.cfg	2017-04-21 11:30:49 +02:00
MaukCC	ad4c696202	Update cartesio_global_Normal_Quality.inst.cfg	2017-04-21 11:30:39 +02:00
MaukCC	d2a948fb5c	Update cartesio_global_Coarse_Quality.inst.cfg	2017-04-21 11:30:15 +02:00
MaukCC	39ac11df59	Update cartesio_global_Extra_Coarse_Quality.inst.cfg	2017-04-21 11:30:09 +02:00
Victor Larchenko	e47ca7a68d	Merge remote-tracking branch 'um/master' into gcode-keywords	2017-04-21 14:36:22 +06:00
MaukCC	d5190b7cf7	Update cartesio_global_Coarse_Quality.inst.cfg	2017-04-21 10:33:45 +02:00
MaukCC	2b31aab28c	Update cartesio_global_Extra_Coarse_Quality.inst.cfg	2017-04-21 10:33:38 +02:00
MaukCC	25ff28041f	Update cartesio_global_High_Quality.inst.cfg	2017-04-21 10:33:30 +02:00
MaukCC	d756ea5021	Update cartesio_global_Normal_Quality.inst.cfg	2017-04-21 10:33:21 +02:00
Victor Larchenko	e5eb0c9a14	Merge remote-tracking branch 'um/master' into theme-picker	2017-04-21 14:29:01 +06:00
MaukCC	319690baa6	Update cartesio_global_High_Quality.inst.cfg	2017-04-21 10:27:05 +02:00
MaukCC	7e426f96fb	Update cartesio_global_Extra_Coarse_Quality.inst.cfg	2017-04-21 10:26:39 +02:00
MaukCC	c80b51ddc9	Update cartesio_global_Normal_Quality.inst.cfg	2017-04-21 10:26:28 +02:00
MaukCC	081505e967	Update cartesio_global_Coarse_Quality.inst.cfg	2017-04-21 10:26:02 +02:00
MaukCC	17408a299f	Update cartesio_global_Coarse_Quality.inst.cfg	2017-04-21 10:19:44 +02:00
MaukCC	c160e4c5d6	Update cartesio_global_Extra_Coarse_Quality.inst.cfg	2017-04-21 10:19:38 +02:00
MaukCC	633c4b87e4	Update cartesio_global_High_Quality.inst.cfg	2017-04-21 10:19:30 +02:00
MaukCC	ea56830880	Update cartesio_global_Normal_Quality.inst.cfg	2017-04-21 10:19:21 +02:00
MaukCC	c75a2941be	Add files via upload	2017-04-21 10:07:25 +02:00
Arjen Hiemstra	3d5e535b69	Select the object underneath the cursor on context menu request ... Contributes to CURA-3609	2017-04-20 17:53:05 +02:00
Arjen Hiemstra	05e1de2fb3	Deprecate the delete/multiply/center methods in CuraApplication ... Since they should no longer be used by the UI. Contributes to CURA-3609	2017-04-20 17:42:06 +02:00
Arjen Hiemstra	e108bd0627	Add extruder selection to Context menu ... Contributes to CURA-3609	2017-04-20 17:42:06 +02:00