mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-21 13:47:59 -06:00
Revert "Made the UI look quite a bit nicer (OS X 10.7 tested)."
This reverts commit 266f7799dd
.
Conflicts:
lib/Slic3r/GUI/SkeinPanel.pm
This commit is contained in:
parent
2c16509e8a
commit
5c79024215
3 changed files with 29 additions and 61 deletions
|
@ -111,68 +111,42 @@ sub new {
|
|||
$make_tab->([qw(cooling)]),
|
||||
$make_tab->([qw(printer filament)], [qw(print_speed speed)]),
|
||||
$make_tab->([qw(gcode)]),
|
||||
$make_tab->([qw(notes)], [qw(extrusion output)]),
|
||||
$make_tab->([qw(notes)]),
|
||||
$make_tab->([qw(extrusion)], [qw(output)]),
|
||||
);
|
||||
|
||||
$tabpanel->AddPage($tabs[0], "Print");
|
||||
$tabpanel->AddPage($tabs[0], "Print Settings");
|
||||
$tabpanel->AddPage($tabs[1], "Cooling");
|
||||
$tabpanel->AddPage($tabs[2], "Printer and Filament");
|
||||
$tabpanel->AddPage($tabs[3], "GCODE");
|
||||
$tabpanel->AddPage($tabs[4], "Advanced");
|
||||
$tabpanel->AddPage($tabs[3], "Start/End GCODE");
|
||||
$tabpanel->AddPage($tabs[4], "Notes");
|
||||
$tabpanel->AddPage($tabs[5], "Advanced");
|
||||
|
||||
my $buttons_sizer;
|
||||
{
|
||||
$buttons_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
|
||||
|
||||
|
||||
my $buttons_left_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
|
||||
$buttons_left_sizer->SetMinSize(300, 0);
|
||||
|
||||
my $save_button = Wx::Button->new($self, -1, "Save Config…");
|
||||
$buttons_left_sizer->Add($save_button, 0);
|
||||
EVT_BUTTON($self, $save_button, sub { $self->save_config });
|
||||
|
||||
$buttons_left_sizer->Add((14, 0), 0);
|
||||
|
||||
my $load_button = Wx::Button->new($self, -1, "Open Config…");
|
||||
$buttons_left_sizer->Add($load_button, 0);
|
||||
EVT_BUTTON($self, $load_button, sub { $self->load_config });
|
||||
|
||||
$buttons_sizer->Add($buttons_left_sizer, 1);
|
||||
|
||||
|
||||
my $font = Wx::Font->new(10, wxDEFAULT, wxNORMAL, wxNORMAL);
|
||||
my $update_sizer = Wx::BoxSizer->new(wxVERTICAL);
|
||||
|
||||
{
|
||||
my $text = Wx::StaticText->new($self, -1, "Version $Slic3r::VERSION");
|
||||
$text->SetFont($font);
|
||||
$update_sizer->Add($text, 0, wxALIGN_CENTER);
|
||||
|
||||
#my $link = Wx::HyperlinkCtrl->new($self, -1, "Check for updates at slic3r.org", "http://slic3r.org/");
|
||||
my $link = Wx::StaticText->new($self, -1, "Check for updates at http://slic3r.org/");
|
||||
$link->SetFont($font);
|
||||
$update_sizer->Add($link, 0, wxALIGN_CENTER);
|
||||
}
|
||||
|
||||
$buttons_sizer->Add($update_sizer, 0, wxEXPAND);
|
||||
|
||||
|
||||
my $buttons_right_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
|
||||
$buttons_right_sizer->SetMinSize(300, 0);
|
||||
|
||||
$buttons_right_sizer->AddStretchSpacer();
|
||||
|
||||
my $slice_button = Wx::Button->new($self, -1, "Slice…");
|
||||
my $slice_button = Wx::Button->new($self, -1, "Slice...");
|
||||
$slice_button->SetDefault();
|
||||
$buttons_right_sizer->Add($slice_button, 0, wxALIGN_RIGHT);
|
||||
$buttons_sizer->Add($slice_button, 0);
|
||||
EVT_BUTTON($self, $slice_button, sub { $self->do_slice });
|
||||
|
||||
$buttons_sizer->Add($buttons_right_sizer, 1, wxALIGN_RIGHT);
|
||||
my $save_button = Wx::Button->new($self, -1, "Save configuration...");
|
||||
$buttons_sizer->Add($save_button, 0);
|
||||
EVT_BUTTON($self, $save_button, sub { $self->save_config });
|
||||
|
||||
my $load_button = Wx::Button->new($self, -1, "Load configuration...");
|
||||
$buttons_sizer->Add($load_button, 0);
|
||||
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", Wx::wxDefaultPosition, Wx::wxDefaultSize, wxALIGN_RIGHT);
|
||||
my $font = Wx::Font->new(10, wxDEFAULT, wxNORMAL, wxNORMAL);
|
||||
$text->SetFont($font);
|
||||
$buttons_sizer->Add($text, 1, wxEXPAND | wxALIGN_RIGHT);
|
||||
}
|
||||
|
||||
my $sizer = Wx::BoxSizer->new(wxVERTICAL);
|
||||
$sizer->Add($buttons_sizer, 0, wxEXPAND | wxALL, (14));
|
||||
$sizer->Add($buttons_sizer, 0, wxEXPAND | wxALL, 10);
|
||||
$sizer->Add($tabpanel);
|
||||
|
||||
$sizer->SetSizeHints($self);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue