3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 15:37:30 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ENH: [STUDIO-3892] different app config dirs for internal/beta

Browse source 
Change-Id: Ibd771b948f9a0b8e95b87c8d7244ab5728b6f4a8
(cherry picked from commit cfbb31fa28e66d780e6305c840ad46091c6f5a8d)
This commit is contained in:
chunmao.guo 2023-08-01 15:26:47 +08:00 • committed by Lane.Wei
parent db038d88fa
commit e3ca9af7e9
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/slic3r/GUI/GUI_App.cpp
View file

@ -299,12 +299,13 @@ public:
memDc.DrawLabel(m_constant_text.version, version_rect, wxALIGN_LEFT | wxALIGN_BOTTOM); memDc.DrawLabel(m_constant_text.version, version_rect, wxALIGN_LEFT | wxALIGN_BOTTOM);
#if BBL_INTERNAL_TESTING #if BBL_INTERNAL_TESTING
wxSize text_rect = memDc.GetTextExtent("Internal Version"); wxString versionText = BBL_INTERNAL_TESTING == 1 ? "Internal Version" : "Beta Version";
wxSize text_rect = memDc.GetTextExtent(versionText);
int start_x = (title_rect.GetLeft() + version_rect.GetRight()) / 2 - text_rect.GetWidth(); int start_x = (title_rect.GetLeft() + version_rect.GetRight()) / 2 - text_rect.GetWidth();
int start_y = version_rect.GetBottom() + 10; int start_y = version_rect.GetBottom() + 10;
wxRect internal_sign_rect(wxPoint(start_x, start_y), wxSize(text_rect)); wxRect internal_sign_rect(wxPoint(start_x, start_y), wxSize(text_rect));
memDc.SetFont(m_constant_text.title_font); memDc.SetFont(m_constant_text.title_font);
memDc.DrawLabel("Internal Version", internal_sign_rect, wxALIGN_TOP | wxALIGN_LEFT); memDc.DrawLabel(versionText, internal_sign_rect, wxALIGN_TOP | wxALIGN_LEFT);
#endif #endif
// load bitmap for logo // load bitmap for logo
@ -2105,22 +2106,22 @@ void GUI_App::init_app_config()
if (data_dir().empty()) { if (data_dir().empty()) {
#ifndef __linux__ #ifndef __linux__
std::string data_dir = wxStandardPaths::Get().GetUserDataDir().ToUTF8().data(); std::string data_dir = wxStandardPaths::Get().GetUserDataDir().ToUTF8().data();
//BBS create folder if not exists
boost::filesystem::path data_dir_path(data_dir);
if (!boost::filesystem::exists(data_dir_path))
boost::filesystem::create_directory(data_dir_path);
set_data_dir(data_dir);
#else #else
// Since version 2.3, config dir on Linux is in ${XDG_CONFIG_HOME}. // Since version 2.3, config dir on Linux is in ${XDG_CONFIG_HOME}.
// https://github.com/prusa3d/PrusaSlicer/issues/2911 // https://github.com/prusa3d/PrusaSlicer/issues/2911
wxString dir; wxString dir;
if (! wxGetEnv(wxS("XDG_CONFIG_HOME"), &dir) || dir.empty() ) if (! wxGetEnv(wxS("XDG_CONFIG_HOME"), &dir) || dir.empty() )
dir = wxFileName::GetHomeDir() + wxS("/.config"); dir = wxFileName::GetHomeDir() + wxS("/.config");
set_data_dir((dir + "/" + GetAppName()).ToUTF8().data()); std::string data_dir = (dir + "/" + GetAppName()).ToUTF8().data();
boost::filesystem::path data_dir_path(data_dir()); #endif
#if BBL_INTERNAL_TESTING
data_dir += BBL_INTERNAL_TESTING == 1 ? "Internal" : "Beta";
#endif
//BBS create folder if not exists
boost::filesystem::path data_dir_path(data_dir);
if (!boost::filesystem::exists(data_dir_path)) if (!boost::filesystem::exists(data_dir_path))
boost::filesystem::create_directory(data_dir_path); boost::filesystem::create_directory(data_dir_path);
#endif set_data_dir(data_dir);
} else { } else {
m_datadir_redefined = true; m_datadir_redefined = true;
} }