mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

turnoff the debug mode on preferences 

also switch the environment to production
and update version to 1.0.10.4

Change-Id: I396993ffa2bdfa5e60d69b61870d3710c6963489
This commit is contained in:
lane.wei 2022-07-16 10:58:48 +08:00 committed by Lane.Wei
parent 0b921c44a8
commit 4544dad62c
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libslic3r/AppConfig.cpp
View File

@ -118,7 +118,7 @@ void AppConfig::set_defaults()
set("use_environment_map", false); set("use_environment_map", false);
#endif // ENABLE_ENVIRONMENT_MAP #endif // ENABLE_ENVIRONMENT_MAP
if (get("use_inches").empty()) if (get("use_inches").empty())
set("use_inches", "0"); set("use_inches", "0");
} }
else { else {
@ -257,7 +257,7 @@ void AppConfig::set_defaults()
} }
if (get("iot_environment").empty()) { if (get("iot_environment").empty()) {
set("iot_environment", "1"); set("iot_environment", "3");
} }
// Remove legacy window positions/sizes // Remove legacy window positions/sizes
@ -1004,11 +1004,11 @@ std::string AppConfig::get_country_code()
{ {
std::string region = get_region(); std::string region = get_region();
/* fix PRE environment when release to public */ /* fix PRE environment when release to public */
#if BBL_RELEASE_TO_PUBLIC #if 0
this->set("iot_environment", "2"); this->set("iot_environment", "2");
return "ENV_CN_PRE"; return "ENV_CN_PRE";
#else #else
if (is_engineering_region()) { return region; } //if (is_engineering_region()) { return region; }
if (region == "CHN" || region == "China") if (region == "CHN" || region == "China")
return "CN"; return "CN";
else if (region == "USA") else if (region == "USA")

5
src/slic3r/GUI/Preferences.cpp
View File

@ -569,15 +569,18 @@ void PreferencesDialog::create()
m_sizer_body->Add(m_top_line, 0, wxEXPAND, 0); m_sizer_body->Add(m_top_line, 0, wxEXPAND, 0);
auto general_page = create_general_page(); auto general_page = create_general_page();
#if !BBL_RELEASE_TO_PUBLIC
auto debug_page = create_debug_page(); auto debug_page = create_debug_page();
#endif
/* create_gui_page(); /* create_gui_page();
create_sync_page(); create_sync_page();
create_shortcuts_page();*/ create_shortcuts_page();*/
m_sizer_body->Add(0, 0, 0, wxTOP, FromDIP(28)); m_sizer_body->Add(0, 0, 0, wxTOP, FromDIP(28));
m_sizer_body->Add(general_page, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(38)); m_sizer_body->Add(general_page, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(38));
#if !BBL_RELEASE_TO_PUBLIC
m_sizer_body->Add(debug_page, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(38)); m_sizer_body->Add(debug_page, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(38));
#endif
m_sizer_body->Add(0, 0, 0, wxBOTTOM, FromDIP(28)); m_sizer_body->Add(0, 0, 0, wxBOTTOM, FromDIP(28));
SetSizer(m_sizer_body); SetSizer(m_sizer_body);
Layout(); Layout();

2
version.inc
View File

@ -7,4 +7,4 @@ set(SLIC3R_APP_KEY "BambuStudio")
if(NOT DEFINED BBL_RELEASE_TO_PUBLIC) if(NOT DEFINED BBL_RELEASE_TO_PUBLIC)
set(BBL_RELEASE_TO_PUBLIC "0") set(BBL_RELEASE_TO_PUBLIC "0")
endif() endif()
set(SLIC3R_VERSION "01.00.10.03") set(SLIC3R_VERSION "01.00.10.04")