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

Make Josef Prusa and Petr Ledvinka happy while we figure out how to handle localized Windows file paths

Browse Source
This commit is contained in:
Alessandro Ranellucci 2012-08-25 19:06:14 +02:00
parent 873ea93832
commit fe6c8fabdb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Slic3r/GUI.pm
View File

@ -47,7 +47,7 @@ sub OnInit {
$self->{notifier} = Slic3r::GUI::Notifier->new; $self->{notifier} = Slic3r::GUI::Notifier->new;
# locate or create data directory # locate or create data directory
$datadir = Wx::StandardPaths::Get->GetUserDataDir; $datadir ||= Wx::StandardPaths::Get->GetUserDataDir;
Slic3r::debugf "Data directory: %s\n", $datadir; Slic3r::debugf "Data directory: %s\n", $datadir;
my $run_wizard = (-d $datadir) ? 0 : 1; my $run_wizard = (-d $datadir) ? 0 : 1;
for ($datadir, "$datadir/print", "$datadir/filament", "$datadir/printer") { for ($datadir, "$datadir/print", "$datadir/filament", "$datadir/printer") {

5
slic3r.pl
View File

@ -27,6 +27,7 @@ my %cli_options = ();
'save=s' => \$opt{save}, 'save=s' => \$opt{save},
'load=s@' => \$opt{load}, 'load=s@' => \$opt{load},
'ignore-nonexistent-config' => \$opt{ignore_nonexistent_config}, 'ignore-nonexistent-config' => \$opt{ignore_nonexistent_config},
'datadir=s' => \$opt{datadir},
'export-svg' => \$opt{export_svg}, 'export-svg' => \$opt{export_svg},
'merge|m' => \$opt{merge}, 'merge|m' => \$opt{merge},
); );
@ -71,6 +72,10 @@ if ($opt{save}) {
my $gui; my $gui;
if (!@ARGV && !$opt{save} && eval "require Slic3r::GUI; 1") { if (!@ARGV && !$opt{save} && eval "require Slic3r::GUI; 1") {
$gui = Slic3r::GUI->new; $gui = Slic3r::GUI->new;
{
no warnings 'once';
$Slic3r::GUI::datadir = $opt{datadir} if $opt{datadir};
}
$gui->{skeinpanel}->load_config_file($_) for @{$opt{load}}; $gui->{skeinpanel}->load_config_file($_) for @{$opt{load}};
$gui->{skeinpanel}->load_config($cli_config); $gui->{skeinpanel}->load_config($cli_config);
$gui->MainLoop; $gui->MainLoop;