Paths to resources / icons / images are set.

This commit is contained in:
bubnikv 2018-09-21 11:40:32 +02:00
parent 9a5796794e
commit 6b2a4ffe03
6 changed files with 55 additions and 31 deletions

View file

@ -2,6 +2,7 @@
#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/filesystem.hpp>
#include <wx/stdpaths.h>
#include <wx/imagpng.h>
@ -40,17 +41,10 @@ bool GUI_App::OnInit()
// Unix: ~/ .Slic3r
// Windows : "C:\Users\username\AppData\Roaming\Slic3r" or "C:\Documents and Settings\username\Application Data\Slic3r"
// Mac : "~/Library/Application Support/Slic3r"
datadir.empty() ?
Slic3r::set_data_dir(wxStandardPaths::Get().GetUserDataDir().ToStdString()) :
Slic3r::set_data_dir(datadir);
if (data_dir().empty())
Slic3r::set_data_dir(wxStandardPaths::Get().GetUserDataDir().ToUTF8().data());
// set_wxapp(this); // #ys_FIXME
// #ys_FIXME temporary workaround
if (var_dir().empty())
set_var_dir("c:\\src\\Slic3r_TMP\\resources\\icons");
if (localization_dir().empty())
set_local_dir("c:\\src\\Slic3r_TMP\\resources\\localization");
app_config = new AppConfig();
// set_app_config(app_config);// #ys_FIXME
preset_bundle = new PresetBundle();