From 5a8c4bf1bf6670f0cd2079c5dc3cf7b14cdc3093 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci <aar@cpan.org> Date: Tue, 3 Jul 2012 19:16:45 +0200 Subject: [PATCH] Move Load Config... and Export Config... to the File menu --- lib/Slic3r/GUI.pm | 17 +++++++++-------- lib/Slic3r/GUI/SkeinPanel.pm | 8 -------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm index a2e7e4904..b4ddb7335 100644 --- a/lib/Slic3r/GUI.pm +++ b/lib/Slic3r/GUI.pm @@ -65,17 +65,18 @@ sub OnInit { # File menu my $fileMenu = Wx::Menu->new; { - $fileMenu->Append(1, "Export Config…"); - $fileMenu->Append(2, "Open Config…"); + $fileMenu->Append(1, "Load Config…"); + $fileMenu->Append(2, "Export Config…"); $fileMenu->AppendSeparator(); - $fileMenu->Append(3, "Slice…"); - $fileMenu->Append(4, "Reslice"); - $fileMenu->Append(5, "Slice and Save As…"); - $fileMenu->Append(6, "Export SVG…"); + $fileMenu->Append(3, "Quick Slice…"); + $fileMenu->Append(4, "Quick Slice (last file)"); + $fileMenu->Append(5, "Quick Slice and Save As…"); + $fileMenu->AppendSeparator(); + $fileMenu->Append(6, "Slice to SVG…"); $fileMenu->AppendSeparator(); $fileMenu->Append(wxID_EXIT, "&Quit"); - EVT_MENU($frame, 1, sub { $frame->{skeinpanel}->save_config }); - EVT_MENU($frame, 2, sub { $frame->{skeinpanel}->load_config }); + EVT_MENU($frame, 1, sub { $frame->{skeinpanel}->load_config }); + EVT_MENU($frame, 2, sub { $frame->{skeinpanel}->save_config }); EVT_MENU($frame, 3, sub { $frame->{skeinpanel}->do_slice }); EVT_MENU($frame, 4, sub { $frame->{skeinpanel}->do_slice(reslice => 1) }); EVT_MENU($frame, 5, sub { $frame->{skeinpanel}->do_slice(save_as => 1) }); diff --git a/lib/Slic3r/GUI/SkeinPanel.pm b/lib/Slic3r/GUI/SkeinPanel.pm index 5762792dc..ce0aaf920 100644 --- a/lib/Slic3r/GUI/SkeinPanel.pm +++ b/lib/Slic3r/GUI/SkeinPanel.pm @@ -40,14 +40,6 @@ sub new { $buttons_sizer->Add($slice_button, 0, wxRIGHT, 20); EVT_BUTTON($self, $slice_button, sub { $self->do_slice }); - my $save_button = Wx::Button->new($self, -1, "Export config…"); - $buttons_sizer->Add($save_button, 0, wxRIGHT, 5); - EVT_BUTTON($self, $save_button, sub { $self->save_config }); - - my $load_button = Wx::Button->new($self, -1, "Load config…"); - $buttons_sizer->Add($load_button, 0, wxRIGHT, 5); - EVT_BUTTON($self, $load_button, sub { $self->load_config }); - my $text = Wx::StaticText->new($self, -1, "Remember to check for updates at http://slic3r.org/\nVersion: $Slic3r::VERSION", wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT); my $font = Wx::Font->new(10, wxDEFAULT, wxNORMAL, wxNORMAL); $text->SetFont($font);