Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
ffe5e0c
feature add printer info sync entrance.
LiuLikeQian Mar 16, 2026
1303cbe
feature limit only one nozzle and not allow to choose nozzle.
LiuLikeQian Mar 16, 2026
c3ac794
fix remove not work code.
LiuLikeQian Mar 16, 2026
b170b26
feature select the u1 machine and show the sync btn entrance. fix the…
LiuLikeQian Mar 17, 2026
876c723
feature when on U1 switch the nozzle diameter and show a tips.
LiuLikeQian Mar 17, 2026
644527f
feature add Graphic Effect Steel Plate for U1
LiuLikeQian Mar 17, 2026
142e5bb
feature add new plate for U1, and U1 default show 3 plates and use su…
LiuLikeQian Mar 17, 2026
45c6e57
feature only U1 has new plate.
LiuLikeQian Mar 17, 2026
4d185b2
feature merge U1 nozzle to U1 type and handle it the same logic.
LiuLikeQian Mar 18, 2026
e92633b
feature upload or print notify web the nozzle info
LiuLikeQian Mar 18, 2026
2c2aa19
feature remove not work code.
LiuLikeQian Mar 18, 2026
224c403
feature rename the graphic effect plate, add dialog for sync nozzle s…
LiuLikeQian Mar 19, 2026
b324fc8
feature sync nozzle info and set the nozzle combobox data.
LiuLikeQian Mar 19, 2026
887101e
feature add tips for plate use filament.
LiuLikeQian Mar 20, 2026
3654ea0
feature remove the nozzle modify entrance.
LiuLikeQian Mar 20, 2026
a78dbcb
feature update the Smooth PEI Plate layer temp.
LiuLikeQian Mar 20, 2026
e1b5320
feature update the plate name for snapmaker u1.
LiuLikeQian Mar 20, 2026
2ffdf64
feature update ui img, guide page merge the nozzle for machine, updat…
LiuLikeQian Mar 30, 2026
a331726
feature update guide page machine select.
LiuLikeQian Mar 30, 2026
440c7c2
feature update guide ui, profiles source.
LiuLikeQian Mar 30, 2026
1301e1d
feature export 3mf include the graphic plate,process soft and load no…
LiuLikeQian Mar 30, 2026
20145b4
feature add tips for smooth pei plater for filament relations,and gra…
LiuLikeQian Mar 31, 2026
b1f9931
feature add file for filament tips.
LiuLikeQian Mar 31, 2026
803347c
feature revert the profiles change.
LiuLikeQian Apr 1, 2026
b4b9321
Merge branch 'dev_2.3.2_alves' of https://github.com/Snapmaker/OrcaSl…
LiuLikeQian Apr 1, 2026
ae0d9fb
fix revert to old profiles
LiuLikeQian Apr 1, 2026
9e4b0f1
Merge branch 'main' into dev_2.3.2_alves
LiuLikeQian Apr 1, 2026
35b7b9d
feature remove not work code.
LiuLikeQian Apr 1, 2026
dcac898
feature add config for tips on filament.
LiuLikeQian Apr 1, 2026
ebb8b5b
feature add nozzle changed and tips filament relations for slice.
LiuLikeQian Apr 1, 2026
6a06009
feature add nozzle for filament tips.
LiuLikeQian Apr 1, 2026
6241343
feature remove the not work code.
LiuLikeQian Apr 2, 2026
1c24d19
feature render panel add graphic hot bed for Custom plater.
LiuLikeQian Apr 2, 2026
4cc3638
fix the judge logic for sync machine filament info.
LiuLikeQian Apr 2, 2026
e28efd7
feature load relations json from profiles source,upgrade translations.
LiuLikeQian Apr 2, 2026
ad905cb
feature update the translation.
LiuLikeQian Apr 2, 2026
1bde7c6
feature update translation,fix sync nozzle bug.
LiuLikeQian Apr 3, 2026
bb75a7e
feature update the translations.
LiuLikeQian Apr 3, 2026
2177da1
fix machine sync question .
LiuLikeQian Apr 3, 2026
2c04618
feature update the hot bed tmp
LiuLikeQian Apr 3, 2026
f598484
Merge branch 'dev_2.3.2_alves' of https://github.com/Snapmaker/OrcaSl…
LiuLikeQian Apr 3, 2026
74e384a
feature update the hot bed tmp
LiuLikeQian Apr 7, 2026
a85a8d6
fix warning rule not work question.
LiuLikeQian Apr 7, 2026
0d3d069
fix switch machine and the device show incorrect.
LiuLikeQian Apr 7, 2026
6c9c339
feature update the config for tips hot bed and use the filament to sl…
LiuLikeQian Apr 7, 2026
037f522
feature fix upgrade lead to resource update fail question.
LiuLikeQian Apr 7, 2026
988ca3b
feature merge main function.
LiuLikeQian Apr 9, 2026
8d8d1ff
feature revert not work code.
LiuLikeQian Apr 9, 2026
c2872d0
feature update the request type.
LiuLikeQian Apr 9, 2026
ce38014
fix build fail bug.
LiuLikeQian Apr 9, 2026
3d4a737
feature update the web resource.
LiuLikeQian Apr 9, 2026
2fce666
fix linux flatpak build fail bug
Apr 9, 2026
e82638e
feature remove the not work code for thow exception.
LiuLikeQian Apr 10, 2026
362e428
Merge branch 'bugfix_source_upgrade' of https://github.com/Snapmaker/…
LiuLikeQian Apr 10, 2026
ffafa33
fix request web,profiles resource and thread not sync question.
LiuLikeQian Apr 10, 2026
713609d
feature remove not work code.
LiuLikeQian Apr 10, 2026
6e4b739
fix invalid version info for update profiles dialog.
LiuLikeQian Apr 10, 2026
cc351f1
Merge branch 'main' into bugfix_source_upgrade
LiuLikeQian Apr 10, 2026
d75e5a0
feature only show a dialog tips for bed tips.
LiuLikeQian Apr 10, 2026
f441b95
feature update web resource.
LiuLikeQian Apr 10, 2026
bad350b
fix the machine filament not sync bug.
LiuLikeQian Apr 10, 2026
58b2b8e
feature get nozzle info data from web.
LiuLikeQian Apr 10, 2026
2edea53
Merge branch 'main' of https://github.com/Snapmaker/OrcaSlicer
LiuLikeQian Apr 10, 2026
58c3029
Merge branch 'main' of https://github.com/Snapmaker/OrcaSlicer
LiuLikeQian Apr 13, 2026
345fc56
Merge branch 'main' of https://github.com/Snapmaker/OrcaSlicer
LiuLikeQian Apr 16, 2026
391fa5b
Merge branch 'main' of https://github.com/Snapmaker/OrcaSlicer
LiuLikeQian May 7, 2026
094f7d8
Merge branch 'main' of https://github.com/Snapmaker/OrcaSlicer
LiuLikeQian May 25, 2026
fe4f356
Merge branch 'main' of https://github.com/Snapmaker/OrcaSlicer
LiuLikeQian May 27, 2026
416bda2
Merge branch 'main' of https://github.com/Snapmaker/OrcaSlicer
LiuLikeQian Jun 2, 2026
31bbe44
add web debug mode
jianguofan Apr 14, 2026
2c10521
fix orca debug
jianguofan Apr 15, 2026
6341d2e
fix accept_loop problem
jianguofan Apr 22, 2026
412b23e
fix debug error
jianguofan Apr 23, 2026
8454fa8
feature code format.
LiuLikeQian Jun 11, 2026
7d818d6
feature remove not work code.
LiuLikeQian Jun 11, 2026
eebed53
Merge branch 'main' into feature_flutter_debug
LiuLikeQian Jun 17, 2026
5d31f3e
Merge branch 'main' into feature_flutter_debug
LiuLikeQian Jun 18, 2026
7ced723
feature web debug separate from the main process.
LiuLikeQian Jun 22, 2026
b669c3e
feature remove the web debug entrance ui.
LiuLikeQian Jun 22, 2026
fe4aa4c
Merge branch 'main' into feature_flutter_debug
LiuLikeQian Jun 23, 2026
7a4c199
fix build fail question.
LiuLikeQian Jun 23, 2026
f01d742
Merge branch 'main' of https://github.com/Snapmaker/OrcaSlicer
LiuLikeQian Jun 23, 2026
18b9cca
Merge branch 'main' into feature_flutter_debug
LiuLikeQian Jun 24, 2026
2f46ecd
Merge branch 'main' into feature_flutter_debug
LiuLikeQian Jun 24, 2026
6bfeab4
Merge branch 'main' into feature_flutter_debug
LiuLikeQian Jun 24, 2026
3f993a2
Merge branch 'main' into feature_flutter_debug
LiuLikeQian Jun 25, 2026
fe73210
Merge branch 'main' of https://github.com/Snapmaker/OrcaSlicer
LiuLikeQian Jun 26, 2026
28bc4ab
Merge branch 'main' into feature_flutter_debug
LiuLikeQian Jun 26, 2026
752849e
Merge branch 'main' into feature_flutter_debug
LiuLikeQian Jul 15, 2026
1a522a5
Merge branch 'feature_flutter_debug' of https://github.com/Snapmaker/…
LiuLikeQian Jul 15, 2026
81161b9
update web debug
jianguofan Jul 20, 2026
e28f05d
feature remove the check for flutter debug.
LiuLikeQian Jul 21, 2026
c48e37c
Merge branch 'feature_flutter_debug' of https://github.com/Snapmaker/…
LiuLikeQian Jul 21, 2026
9dd9523
feature reverse the changed for data check.
LiuLikeQian Jul 22, 2026
c7a24da
feature add function for web debug.
LiuLikeQian Jul 22, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/slic3r/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,8 @@ set(SLIC3R_GUI_SOURCES
GUI/SMPhysicalPrinterDialog.cpp
GUI/SSWCP.cpp
GUI/SSWCP.hpp
GUI/WebSocketDebugServer.cpp
GUI/WebSocketDebugServer.hpp
GUI/DownloadManager.cpp
GUI/DownloadManager.hpp
GUI/GenericDownloadDialog.cpp
Expand Down
89 changes: 43 additions & 46 deletions src/slic3r/GUI/GUI_App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@ void GUI_App::post_init()
}
}

// Start preset sync after project opened, otherwise we could have preset change during project opening which could cause crash
// Start preset sync after project opened, otherwise we could have preset change during project opening which could cause crash
if (app_config->get("sync_user_preset") == "true") {
// BBS loading user preset
// Always async, not such startup step
Expand All @@ -1143,7 +1143,7 @@ void GUI_App::post_init()
// Neither wxShowEvent nor wxWindowCreateEvent work reliably.
if (this->preset_updater) { // G-Code Viewer does not initialize preset_updater.
CallAfter([this] {
try {

bool cw_showed = this->config_wizard_startup();

SSWCP_MqttAgent_Instance::m_dialog = new WebPresetDialog(this);
Expand All @@ -1155,13 +1155,7 @@ void GUI_App::post_init()
this->preset_updater->sync(http_url, language, network_ver, sys_preset ? preset_bundle : nullptr);
this->preset_updater->sync_web_async(true);
this->check_new_version_sf(false, false);
} catch (const std::exception& e) {
BOOST_LOG_TRIVIAL(error) << "CallAfter config wizard exception: " << e.what();
flush_logs();
} catch (...) {
BOOST_LOG_TRIVIAL(error) << "CallAfter config wizard unknown exception";
flush_logs();
}

});
}

Expand Down Expand Up @@ -1988,7 +1982,7 @@ void GUI_App::init_networking_callbacks()
else {
obj->parse_json(msg, true);
}


if (!this->is_enable_multi_machine()) {
if ((sel == obj || sel == nullptr) && obj->is_ams_need_update) {
Expand Down Expand Up @@ -2801,7 +2795,7 @@ bool GUI_App::on_init_inner()
skip_this_version = false;
}
}
if (!skip_this_version || evt.GetInt() != 0) {
if (!skip_this_version || evt.GetInt() != 0) {
wxString extmsg = wxString::FromUTF8(version_info.description);
if(!m_updateDialog)
return;
Expand All @@ -2811,8 +2805,8 @@ bool GUI_App::on_init_inner()
}
m_updateDialog->Raise();
m_updateDialog->Show();
m_updateDialog->setUrl(version_info.url);
m_updateDialog->setUrl(version_info.url);

}
}
});
Expand All @@ -2828,7 +2822,7 @@ bool GUI_App::on_init_inner()
false,
wxCENTER | wxICON_INFORMATION);
dialog.SetExtendedMessage(description_text);

int result = dialog.ShowModal();
switch (result)
{
Expand All @@ -2840,7 +2834,7 @@ bool GUI_App::on_init_inner()
wxGetApp().mainframe->Close(true);
break;
case wxID_CANCEL:
wxGetApp().mainframe->Close(true);
wxGetApp().mainframe->Close(true);
break;
default:
wxGetApp().mainframe->Close(true);
Expand Down Expand Up @@ -3081,6 +3075,16 @@ bool GUI_App::on_init_inner()

do_notify_flutter_web_copy_failure();

// WebSocket debug server: only when Preferences → "Web Debug Mode" (websocket_debug) is on.
// When off, explicitly stop the debug server so port 8766 is not left listening.
const bool websocket_debug_pref = app_config->get_bool("websocket_debug");
if (websocket_debug_pref) {
BOOST_LOG_TRIVIAL(info) << "Web Debug Mode enabled in preferences, starting WebSocket debug server (port 8766)";
Slic3r::GUI::SSWCP::enable_debug_mode(true);
} else {
Slic3r::GUI::SSWCP::enable_debug_mode(false);
}

profiler.mark("on_init_inner return");

return true;
Expand Down Expand Up @@ -3130,7 +3134,7 @@ void GUI_App::machine_find()
// wcp订阅
json data = this->app_config->get_devices();
wxGetApp().device_card_notify(data);

});
}
}
Expand Down Expand Up @@ -3905,7 +3909,7 @@ void GUI_App::recreate_GUI(const wxString &msg_name)
std::string printer_model = printer_model_opt->value;
is_snapmaker_u1 = boost::icontains(printer_model, "Snapmaker") && boost::icontains(printer_model, "U1");
}

if (!preset_bundle->is_bbl_vendor()) {
if (is_snapmaker_u1) {
wxString url = wxString::FromUTF8(LOCALHOST_URL + std::to_string(get_page_http_port()) + "/web/flutter_web/index.html?path=2");
Expand All @@ -3919,7 +3923,7 @@ void GUI_App::recreate_GUI(const wxString &msg_name)
}

wxGetApp().device_card_notify(devices);

BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "recreate_GUI exit";
}

Expand Down Expand Up @@ -4581,17 +4585,17 @@ std::string GUI_App::handle_web_request(std::string cmd)
if (path.has_value()) {
wxLaunchDefaultBrowser(path.value());
}
}
}
else if (command_str.compare("homepage_makerlab_get") == 0) {
//if (mainframe->m_webview) { mainframe->m_webview->SendMakerlabList(); }
}
else if (command_str.compare("makerworld_model_open") == 0)
else if (command_str.compare("makerworld_model_open") == 0)
{
if (root.get_child_optional("model") != boost::none) {
pt::ptree data_node = root.get_child("model");
boost::optional<std::string> path = data_node.get_optional<std::string>("url");
if (path.has_value())
{
if (path.has_value())
{
wxString realurl = from_u8(url_decode(path.value()));
wxGetApp().request_model_download(realurl);
}
Expand Down Expand Up @@ -4648,7 +4652,7 @@ void GUI_App::request_open_project(std::string project_id)
CallAfter([this, project_id] { mainframe->open_recent_project(-1, wxString::FromUTF8(project_id)); });
}

void GUI_App::sm_request_remove_project(std::string project_id)
void GUI_App::sm_request_remove_project(std::string project_id)
{
mainframe->sm_remove_recent_project(wxString::FromUTF8(project_id));
}
Expand Down Expand Up @@ -5040,7 +5044,7 @@ void GUI_App::check_web_version()
}

void GUI_App::check_preset_version()
{
{
if (preset_updater != nullptr)
preset_updater->sync_config_async();
}
Expand Down Expand Up @@ -5108,11 +5112,11 @@ void GUI_App::check_new_version_sf(bool show_tips, bool by_user)
if (platformType == "win") {
fileSize = defaultObj.value("file_size", 0);
fileMd5 = defaultObj.value("file_md5", "");
fileSha256 = defaultObj.value("file_sha256", "");
version_info.url = defaultObj.value("file_url", "");
fileSha256 = defaultObj.value("file_sha256", "");
version_info.url = defaultObj.value("file_url", "");

reservedData = defaultObj.value("reserved_1", "");
reservedData2 = defaultObj.value("reserved_2", "");
reservedData2 = defaultObj.value("reserved_2", "");
}
else if (platformType == "mac")
{
Expand Down Expand Up @@ -5141,8 +5145,8 @@ void GUI_App::check_new_version_sf(bool show_tips, bool by_user)
version_info.url = platformObj.value("file_url", "");

reservedData = platformObj.value("reserved_1", "");
reservedData2 = platformObj.value("reserved_2", "");
reservedData2 = platformObj.value("reserved_2", "");

}
else
{
Expand Down Expand Up @@ -5179,7 +5183,7 @@ void GUI_App::check_new_version_sf(bool show_tips, bool by_user)
GUI::wxGetApp().QueueEvent(evt);
} catch (const std::exception& ex) {
std::string errorMsg = ex.what();
BOOST_LOG_TRIVIAL(fatal) << "request server soft update data error:" << errorMsg;
BOOST_LOG_TRIVIAL(fatal) << "request server soft update data error:" << errorMsg;
}
})
.perform();
Expand Down Expand Up @@ -5612,7 +5616,7 @@ void GUI_App::stop_sync_user_preset()
// m_http_server.stop();
//}

void GUI_App::start_page_http_server()
void GUI_App::start_page_http_server()
{
if (!m_page_http_server.is_started())
m_page_http_server.start();
Expand Down Expand Up @@ -6931,7 +6935,7 @@ bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage
}
auto isAgree = wxGetApp().app_config->get("app", PRIVACY_POLICY_FLAGS);

user_update_privacy_notify(isAgree == "true");
user_update_privacy_notify(isAgree == "true");
BOOST_LOG_TRIVIAL(warning) << "run_wizard changed the privacy policy with: " << (isAgree);
return res;
}
Expand Down Expand Up @@ -7143,7 +7147,7 @@ void GUI_App::user_update_privacy_notify(const bool& res)
json data;

data[PRIVACY_POLICY_FLAGS] = res;

for (const auto& instance : m_user_update_privacy_subscribers) {
auto ptr = instance.second.lock();
if (ptr) {
Expand All @@ -7170,7 +7174,7 @@ bool GUI_App::config_wizard_startup()
auto isAgree = wxGetApp().app_config->get("app", PRIVACY_POLICY_FLAGS);
user_update_privacy_notify(isAgree == "true");
BOOST_LOG_TRIVIAL(warning) << "config_wizard_startup changed the privacy policy with: " << (isAgree);
try {

if (!m_app_conf_exists || preset_bundle->printers.only_default_printers()) {
BOOST_LOG_TRIVIAL(info) << "run wizard...";
run_wizard(ConfigWizard::RR_DATA_EMPTY);
Expand All @@ -7179,17 +7183,10 @@ bool GUI_App::config_wizard_startup()
return true;
}

if (isAgree.empty())
{
run_wizard(ConfigWizard::RR_DATA_EMPTY); // Compatible with older versions
return true;
}
} catch (const std::exception& e) {
BOOST_LOG_TRIVIAL(error) << "config_wizard_startup exception: " << e.what();
flush_logs();
} catch (...) {
BOOST_LOG_TRIVIAL(error) << "config_wizard_startup unknown exception";
flush_logs();
if (isAgree.empty())
{
run_wizard(ConfigWizard::RR_DATA_EMPTY); // Compatible with older versions
return true;
}

return false;
Expand Down Expand Up @@ -7474,7 +7471,7 @@ bool GUI_App::sm_disconnect_current_machine(bool need_reload_printerview)
// wxGetApp().load_current_presets();

});

}

return true;
Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/GUI_App.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,8 @@ class GUI_App : public wxApp
bool is_user_login();

wxString get_international_url(const wxString& origin_url);
wxString flutter_web_base_url(const wxString& path);
wxString build_flutter_web_url(const wxString& path);

// SM
struct SMUserInfo
Expand Down
28 changes: 16 additions & 12 deletions src/slic3r/GUI/Preferences.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <memory>

#include "sentry_wrapper/SentryWrapper.hpp"
#include "SSWCP.hpp"

#ifdef __WINDOWS__
#ifdef _MSW_DARK_MODE
Expand Down Expand Up @@ -337,7 +338,7 @@ wxBoxSizer *PreferencesDialog::create_item_region_combobox(wxString title, wxWin
combobox->GetDropDown().Bind(wxEVT_COMBOBOX, [this, combobox, current_region, local_regions](wxCommandEvent &e) {
auto region_index = e.GetSelection();
auto region = local_regions[region_index];

// snapmaker
AppConfig* config = GUI::wxGetApp().app_config;
combobox->SetSelection(region_index);
Expand Down Expand Up @@ -771,9 +772,9 @@ wxBoxSizer *PreferencesDialog::create_item_checkbox(wxString title, wxWindow *pa

if (param == PRIVACY_POLICY_FLAGS)
{
app_config->set("app", PRIVACY_POLICY_FLAGS, checkbox->GetValue());
app_config->set("app", PRIVACY_POLICY_FLAGS, checkbox->GetValue());
BOOST_LOG_TRIVIAL(warning) <<"create_item_checkbox changed the privacy policy with: "<<(checkbox->GetValue()?"true" : "false");
wxGetApp().user_update_privacy_notify(checkbox->GetValue());
wxGetApp().user_update_privacy_notify(checkbox->GetValue());
}
// if (param == "staff_pick_switch") {
// bool pbool = app_config->get("staff_pick_switch") == "true";
Expand Down Expand Up @@ -863,7 +864,8 @@ wxBoxSizer *PreferencesDialog::create_item_checkbox(wxString title, wxWindow *pa
//// for debug mode
if (param == "developer_mode") { m_developer_mode_ckeckbox = checkbox; }
if (param == "internal_developer_mode") { m_internal_developer_mode_ckeckbox = checkbox; }
if (param == "legacy_networking") {

if (param == "legacy_networking") {
m_legacy_networking_ckeckbox = checkbox;
bool pbool = app_config->get_bool("installed_networking");
checkbox->Enable(pbool);
Expand Down Expand Up @@ -1208,7 +1210,7 @@ wxWindow* PreferencesDialog::create_general_page()
auto item_region= create_item_region_combobox(_L("Login Region"), page, _L("Login Region"), Regions);

// SM Beta: temporarily open the item_stealth_mode and close the network plugin

/*auto item_stealth_mode = create_item_checkbox(_L("Stealth mode"), page, _L("This stops the transmission of data to Bambu's cloud services. Users who don't use BBL machines or use LAN mode only can safely turn on this function."), 50, "stealth_mode");
/*auto item_stealth_mode = create_item_checkbox(_L("Stealth mode"), page, _L("This stops the transmission of data to Bambu's cloud services. Users who don't use BBL machines or use LAN mode only can safely turn on this function."), 50, "stealth_mode");
auto item_enable_plugin = create_item_checkbox(_L("Enable network plugin"), page, _L("Enable network plugin"), 50, "installed_networking");
Expand All @@ -1218,17 +1220,17 @@ wxWindow* PreferencesDialog::create_general_page()
app_config->set_bool("installed_networking", false);
app_config->save();


//auto item_check_stable_version_only = create_item_checkbox(_L("Check for stable updates only"), page, _L("Check for stable updates only"), 50, "check_stable_update_only");

std::vector<wxString> Units = {_L("Metric") + " (mm, g)", _L("Imperial") + " (in, oz)"};
auto item_currency = create_item_combobox(_L("Units"), page, _L("Units"), "use_inches", Units);
auto item_single_instance = create_item_checkbox(_L("Allow only one Snapmaker Orca instance"), page,
auto item_single_instance = create_item_checkbox(_L("Allow only one Snapmaker Orca instance"), page,
#if __APPLE__
_L("On OSX there is always only one instance of app running by default. However it is allowed to run multiple instances "
"of same app from the command line. In such case this settings will allow only one instance."),
#else
_L("If this is enabled, when starting Snapmaker Orca and another instance of the same Snapmaker Orca is already running, that instance will be reactivated instead."),
_L("If this is enabled, when starting Snapmaker Orca and another instance of the same Snapmaker Orca is already running, that instance will be reactivated instead."),
#endif
50, "single_instance");

Expand Down Expand Up @@ -1346,7 +1348,7 @@ wxWindow* PreferencesDialog::create_general_page()

hyperlink->SetFont(Label::Head_13);
item_priv_policy->Add(hyperlink, 0, wxALIGN_CENTER, 0);

auto title_develop_mode = create_item_title(_L("Develop mode"), page, _L("Develop mode"));
auto item_develop_mode = create_item_checkbox(_L("Develop mode"), page, _L("Develop mode"), 50, "developer_mode");
auto item_skip_ams_blacklist_check = create_item_checkbox(_L("Skip AMS blacklist check"), page, _L("Skip AMS blacklist check"), 50, "skip_ams_blacklist_check");
Expand Down Expand Up @@ -1380,7 +1382,7 @@ wxWindow* PreferencesDialog::create_general_page()
//sizer_page->Add(item_check_stable_version_only, 0, wxTOP, FromDIP(3));

// SM Beta: temporarily open the item_stealth_mode and close the network plugin

/*sizer_page->Add(item_stealth_mode, 0, wxTOP, FromDIP(3));
sizer_page->Add(item_enable_plugin, 0, wxTOP, FromDIP(3));
sizer_page->Add(item_legacy_network_plugin, 0, wxTOP, FromDIP(3));
Expand Down Expand Up @@ -1427,9 +1429,10 @@ wxWindow* PreferencesDialog::create_general_page()
sizer_page->Add(title_develop_mode, 0, wxTOP | wxEXPAND, FromDIP(20));
sizer_page->Add(item_develop_mode, 0, wxTOP, FromDIP(3));
sizer_page->Add(item_skip_ams_blacklist_check, 0, wxTOP, FromDIP(3));



sizer_page->Add(title_user_experience, 0, wxTOP, FromDIP(20));
sizer_page->Add(item_priv_policy, 0, wxTOP, FromDIP(3));
sizer_page->Add(item_priv_policy, 0, wxTOP, FromDIP(3));

page->SetSizer(sizer_page);
page->Layout();
Expand Down Expand Up @@ -1514,6 +1517,7 @@ wxWindow* PreferencesDialog::create_debug_page()
page->SetBackgroundColour(*wxWHITE);

m_internal_developer_mode_def = app_config->get("internal_developer_mode");
m_websocket_debug_def = app_config->get("websocket_debug");
m_backup_interval_def = app_config->get("backup_interval");
m_iot_environment_def = app_config->get("iot_environment");

Expand Down
Loading
Loading