On Windows use the Slic3r.ico instead of the PNG file

for the application icon.

Conflicts:

	lib/Slic3r/GUI/MainFrame.pm
This commit is contained in:
bubnikv 2016-10-24 18:05:26 +02:00 committed by Alessandro Ranellucci
parent 8c315ff467
commit 736e2cc4e6

View File

@ -21,7 +21,11 @@ sub new {
my ($class, %params) = @_; my ($class, %params) = @_;
my $self = $class->SUPER::new(undef, -1, 'Slic3r', wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE); my $self = $class->SUPER::new(undef, -1, 'Slic3r', wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE);
$self->SetIcon(Wx::Icon->new($Slic3r::var->("Slic3r_128px.png"), wxBITMAP_TYPE_PNG) ); if ($^O eq 'MSWin32') {
$self->SetIcon(Wx::Icon->new($Slic3r::var->("Slic3r.ico"), wxBITMAP_TYPE_ICO));
} else {
$self->SetIcon(Wx::Icon->new($Slic3r::var->("Slic3r_128px.png"), wxBITMAP_TYPE_PNG));
}
# store input params # store input params
$self->{mode} = $params{mode}; $self->{mode} = $params{mode};