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

Handle ENTER key in Slic3r::GUI::SavePresetWindow

Browse Source
This commit is contained in:
Henrik Brix Andersen 2012-06-21 13:01:59 +02:00
parent f69903573a
commit c4f8c36ecc
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -480,7 +480,7 @@ sub append_optgroup {
package Slic3r::GUI::SavePresetWindow;
use Wx qw(:sizer);
use Wx::Event qw(EVT_BUTTON);
use Wx::Event qw(EVT_BUTTON EVT_TEXT_ENTER);
use base 'Wx::Dialog';
sub new {
@ -489,19 +489,17 @@ sub new {
my $self = $class->SUPER::new($parent, -1, "Save preset", [-1, -1], [-1, -1]);
my $text = Wx::StaticText->new($self, -1, "Save settings as:", [-1, -1], [-1, -1]);
my $combo = Wx::ComboBox->new($self, -1, $params{default}, [-1, -1], [-1, -1], $params{values});
$self->{combo} = Wx::ComboBox->new($self, -1, $params{default}, [-1, -1], [-1, -1], $params{values},
&Wx::wxTE_PROCESS_ENTER);
my $buttons = $self->CreateStdDialogButtonSizer(&Wx::wxOK | &Wx::wxCANCEL);
my $sizer = Wx::BoxSizer->new(wxVERTICAL);
$sizer->Add($text, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 10);
$sizer->Add($combo, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
$sizer->Add($self->{combo}, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
$sizer->Add($buttons, 0, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, 10);
EVT_BUTTON($self, &Wx::wxID_OK, sub {
if (($self->{chosen_name} = $combo->GetValue) && $self->{chosen_name} =~ /^[a-z0-9 _-]+$/i) {
$self->EndModal(&Wx::wxID_OK);
}
});
EVT_BUTTON($self, &Wx::wxID_OK, \&accept);
EVT_TEXT_ENTER($self, $self->{combo}, \&accept);
$self->SetSizer($sizer);
$sizer->SetSizeHints($self);
@ -509,6 +507,14 @@ sub new {
return $self;
}
sub accept {
my ($self, $event) = @_;
if (($self->{chosen_name} = $self->{combo}->GetValue) && $self->{chosen_name} =~ /^[a-z0-9 _-]+$/i) {
$self->EndModal(&Wx::wxID_OK);
}
}
sub get_name {
my $self = shift;
return $self->{chosen_name};