Merged SkeinPanel into MainFrame

This commit is contained in:
Alessandro Ranellucci 2014-06-14 19:54:18 +02:00
parent 93b9116565
commit ddac2d1570
12 changed files with 835 additions and 846 deletions

View file

@ -96,8 +96,8 @@ if (!@ARGV && !$opt{save} && eval "require Slic3r::GUI; 1") {
}
$gui = Slic3r::GUI->new;
setlocale(LC_NUMERIC, 'C');
$gui->{skeinpanel}->load_config_file($_) for @{$opt{load}};
$gui->{skeinpanel}->load_config($cli_config);
$gui->{mainframe}->load_config_file($_) for @{$opt{load}};
$gui->{mainframe}->load_config($cli_config);
$gui->MainLoop;
exit;
}