3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent user from saving a preset with the "- default -" name. #1717

Browse Source
This commit is contained in:
Alessandro Ranellucci 2014-03-23 21:40:45 +01:00
parent e9620c30b1
commit 67f3e9962b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Slic3r/Config.pm
View File

@ -119,7 +119,7 @@ sub _handle_legacy {
if ($opt_key eq 'gcode_flavor' && $value eq 'makerbot') { if ($opt_key eq 'gcode_flavor' && $value eq 'makerbot') {
$value = 'makerware'; $value = 'makerware';
} }
if ($opt_key eq 'fill_density' && $value <= 1) { if ($opt_key eq 'fill_density' && defined($value) && $value <= 1) {
# fill_density was turned into a percent value # fill_density was turned into a percent value
$value *= 100; $value *= 100;
$value = "$value"; # force update of the PV value, workaround for bug https://rt.cpan.org/Ticket/Display.html?id=94110 $value = "$value"; # force update of the PV value, workaround for bug https://rt.cpan.org/Ticket/Display.html?id=94110

12
lib/Slic3r/GUI/Tab.pm
View File

@ -893,8 +893,10 @@ sub new {
my ($parent, %params) = @_; my ($parent, %params) = @_;
my $self = $class->SUPER::new($parent, -1, "Save preset", wxDefaultPosition, wxDefaultSize); my $self = $class->SUPER::new($parent, -1, "Save preset", wxDefaultPosition, wxDefaultSize);
my @values = grep $_ ne '- default -', @{$params{values}};
my $text = Wx::StaticText->new($self, -1, "Save " . lc($params{title}) . " as:", wxDefaultPosition, wxDefaultSize); my $text = Wx::StaticText->new($self, -1, "Save " . lc($params{title}) . " as:", wxDefaultPosition, wxDefaultSize);
$self->{combo} = Wx::ComboBox->new($self, -1, $params{default}, wxDefaultPosition, wxDefaultSize, $params{values}, $self->{combo} = Wx::ComboBox->new($self, -1, $params{default}, wxDefaultPosition, wxDefaultSize, \@values,
wxTE_PROCESS_ENTER); wxTE_PROCESS_ENTER);
my $buttons = $self->CreateStdDialogButtonSizer(wxOK | wxCANCEL); my $buttons = $self->CreateStdDialogButtonSizer(wxOK | wxCANCEL);
@ -916,10 +918,12 @@ sub accept {
my ($self, $event) = @_; my ($self, $event) = @_;
if (($self->{chosen_name} = $self->{combo}->GetValue)) { if (($self->{chosen_name} = $self->{combo}->GetValue)) {
if ($self->{chosen_name} =~ /^[^<>:\/\\|?*\"]+$/i) { if ($self->{chosen_name} !~ /^[^<>:\/\\|?*\"]+$/i) {
$self->EndModal(wxID_OK);
} else {
Slic3r::GUI::show_error($self, "The supplied name is not valid; the following characters are not allowed: <>:/\|?*\""); Slic3r::GUI::show_error($self, "The supplied name is not valid; the following characters are not allowed: <>:/\|?*\"");
} elsif ($self->{chosen_name} eq '- default -') {
Slic3r::GUI::show_error($self, "The supplied name is not available.");
} else {
$self->EndModal(wxID_OK);
} }
} }
} }