juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-11 06:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix lost User Experience on settings

Browse Source
This commit is contained in:
alves
2025-12-23 18:04:33 +08:00
parent 4f07b65525
commit f121f45390
4 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/AppConfig.cpp
View File

@@ -89,7 +89,7 @@ bool AppConfig::get_stealth_mode()
return true;
}
auto isAgree = get("snapmaker_privacy_policy", "isagree");
auto isAgree = get("app", "privacy_policy_isagree");
if (isAgree.empty())
{

4
src/slic3r/GUI/GUI_App.cpp
View File

@@ -3764,7 +3764,7 @@ if (res) {
} catch (std::exception &) {
// wxMessageBox(e.what(), "", MB_OK);
}
auto isAgree = wxGetApp().app_config->get("snapmaker_privacy_policy", "isagree");
auto isAgree = wxGetApp().app_config->get("app", "isagree");
set_privacy_policy(isAgree == "true");
}
@@ -7072,7 +7072,7 @@ bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage
mainframe->refresh_plugin_tips();
// BBS: remove SLA related message
}
auto isAgree = wxGetApp().app_config->get("snapmaker_privacy_policy", "isagree");
auto isAgree = wxGetApp().app_config->get("app", "privacy_policy_isagree");
set_privacy_policy(isAgree == "true");

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

@@ -19,6 +19,8 @@
#include <wx/display.h>
#include <map>
#include "sentry_wrapper/SentryWrapper.hpp"
#ifdef __WINDOWS__
#ifdef _MSW_DARK_MODE
#include "dark_mode.hpp"
@@ -746,6 +748,8 @@ wxBoxSizer *PreferencesDialog::create_item_checkbox(wxString title, wxWindow *pa
app_config->set_bool(param, checkbox->GetValue());
app_config->save();
if (param == "privacy_policy_isagree")
set_privacy_policy(checkbox->GetValue());
// if (param == "staff_pick_switch") {
// bool pbool = app_config->get("staff_pick_switch") == "true";
// wxGetApp().switch_staff_pick(pbool);
@@ -1285,6 +1289,22 @@ wxWindow* PreferencesDialog::create_general_page()
auto item_darkmode = create_item_darkmode_checkbox(_L("Enable Dark mode"), page,_L("Enable Dark mode"), 50, "dark_color_mode");
#endif
std::string enUrl = "https://www.snapmaker.com/privacy-policy";
std::string cnUrl = "https://www.snapmaker.cn/privacy-policy";
auto app_config = wxGetApp().app_config;
std::string region = app_config->get("language");
auto title_user_experience = create_item_title(_L("User Experience"), page, _L("User Experience"));
auto item_priv_policy = create_item_checkbox(_L("Join Customer Experience Improvement Program."), page, _L(""), 50, "privacy_policy_isagree");
wxHyperlinkCtrl* hyperlink = nullptr;
if (region.empty() || region != "zh_CN")
hyperlink = new wxHyperlinkCtrl(page, wxID_ANY, _L("What data would be collected?"), enUrl);
else
hyperlink = new wxHyperlinkCtrl(page, wxID_ANY, _L("What data would be collected?"), cnUrl);
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");
@@ -1364,6 +1384,9 @@ 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));
page->SetSizer(sizer_page);
page->Layout();

2
src/slic3r/GUI/WebGuideDialog.cpp
View File

@@ -648,7 +648,7 @@ int GuideFrame::SaveProfile()
// m_MainPtr->app_config->set(std::string(m_SectionName.mb_str()), "privacyuse", "1");
// } else
// m_MainPtr->app_config->set(std::string(m_SectionName.mb_str()), "privacyuse", "0");
m_MainPtr->app_config->set("snapmaker_privacy_policy", "isagree", PrivacyUse);
m_MainPtr->app_config->set("app", "privacy_policy_isagree", PrivacyUse);
m_MainPtr->app_config->set("region", m_Region);
m_MainPtr->app_config->set_bool("stealth_mode", StealthMode);