Merge branch 'per-extruder-retraction-settings'

Conflicts:
	lib/Slic3r/Config.pm
	lib/Slic3r/GUI/Tab.pm
This commit is contained in:
Alessandro Ranellucci 2012-08-08 22:06:47 +02:00
commit 9ca21c835c
5 changed files with 68 additions and 47 deletions

View file

@ -558,13 +558,6 @@ sub build {
},
]);
$self->add_options_page('Retraction', 'arrow_up.png', optgroups => [
{
title => 'Retraction',
options => [qw(retract_length retract_lift retract_speed retract_restart_extra retract_before_travel)],
},
]);
$self->add_options_page('Custom G-code', 'cog.png', optgroups => [
{
title => 'Start G-code',
@ -616,6 +609,13 @@ sub _build_extruder_pages {
title => 'Position (for multi-extruder printers)',
options => ['extruder_offset#' . $extruder_idx],
},
{
title => 'Retraction',
options => [
map "${_}#${extruder_idx}",
qw(retract_length retract_lift retract_speed retract_restart_extra retract_before_travel)
],
},
]);
$self->{extruder_pages}[$extruder_idx]{disabled} = 0;
}