Commit graph

8977 commits

Author SHA1 Message Date
Arjen Hiemstra
0fad973181 Never enable the per-object tool when in simple mode
Contributes to CURA-3577
2017-04-25 16:12:36 +02:00
Arjen Hiemstra
7822173881 Remove extruder selection from per-object settings tool
Contributes to CURA-3577
2017-04-25 16:12:03 +02:00
Arjen Hiemstra
89e6313143 Add buttons to select the extruder for the selection to the toolbar
Contributes to CURA-3577
2017-04-25 16:11:31 +02:00
Arjen Hiemstra
48baf272b4 Fix the extruder icons to have a proper square aspect ratio
Contributes to CURA-3577
2017-04-25 16:10:44 +02:00
Arjen Hiemstra
c85f635125 Add support for overriding the background color of a Tool button
Contributes to CURA-3577
2017-04-25 16:09:51 +02:00
Lipu Fei
268a9c9bac Add priming_enabled option into fdm_printer
CURA-3634
2017-04-25 16:07:32 +02:00
Arjen Hiemstra
09f23f5f91 Styling fixes in Toolbar QML 2017-04-25 11:31:59 +02:00
Jack Ha
8a227c0269 Revert permissions 2017-04-25 11:19:37 +02:00
Jack Ha
74059a82a5 Added some smoketests. CURA-3297 2017-04-25 11:18:55 +02:00
Jack Ha
ed23e6f5b2 Removed more commented out code. CURA-3497 2017-04-25 08:56:28 +02:00
Jack Ha
163929196d Removed commented out code. CURA-3497 2017-04-25 08:50:22 +02:00
Jack Ha
c91bc015e4 Removed unused variables. CURA-3497 2017-04-25 08:43:44 +02:00
Ghostkeeper
15593de404
Fix extruder number dependency of support roof pattern
It was depending on support bottom extruder.

Contributes to issue CURA-3491.
2017-04-24 17:31:07 +02:00
Arjen Hiemstra
ada614e413 Workaround a tiny display issue with checkable MenuItems
If there are no changes to make, we still need to reset the selected
extruders. This is a workaround for checked menu items being deselected
while they actually should still be selected.

Contributes to CURA-3609
2017-04-24 17:11:37 +02:00
Arjen Hiemstra
89310cb41e Select the group when right clicking an object that is part of a group
Instead of selecting the individual object.

Contributes to CURA-3609
2017-04-24 17:10:00 +02:00
Arjen Hiemstra
86d3cbadca Also search through groups when figuring out the extruders of the selection
Contributes to CURA-3609
2017-04-24 17:09:18 +02:00
Arjen Hiemstra
b4c557679c Change the selected extruder for all child nodes of a group
Instead of setting the extruder for the group node, go through all
children and set their extruders instead. Fixes extruder selection on
groups.

Contributes to CURA-3609
2017-04-24 17:08:19 +02:00
Jaime van Kessel
33d92f9596 Merge branch 'master' of github.com:Ultimaker/Cura into feature_extruder_buttons 2017-04-24 16:39:15 +02:00
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