3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-18 22:31:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Paths to resources / icons / images are set.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/GUI_App.cpp
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();

2
src/slic3r/GUI/GUI_App.hpp
View file

@ -42,8 +42,6 @@ class Tab;
class GUI_App : public wxApp
{
// Datadir provided on the command line.
std::string datadir = "";
bool no_plater{ true };
bool app_conf_exists{ false };

12
src/slic3r/GUI/MainFrame.cpp
View file

@ -57,12 +57,14 @@ wxFrame(NULL, wxID_ANY, "FORK_NAME-VERSION", wxDefaultPosition, wxDefaultSize, w
m_statusbar->set_status_text(_(L("Version ")) +
"Slic3r_VERSION" + // Slic3r::VERSION +
_(L(" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases")));
// Make the global status bar and its progress indicator available in C++
m_appController->set_global_progress_indicator(m_statusbar);
// m_appController->set_model(m_plater->model);
// m_appController->set_print(m_plater->print);
// m_plater->appController = m_appController;
// m_appController->set_model(m_plater->model);
// m_appController->set_print(m_plater->print);
// m_plater->appController = m_appController;
GUI::set_gui_appctl();
// Make the global status bar and its progress indicator available in C++
m_appController->set_global_progress_indicator(m_statusbar);
m_loaded = true;