juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-31 05:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #120 from Snapmaker/dev_upgrade_alves

Browse Source 
feature add language support for web preset update
This commit is contained in:
Alves
2026-01-16 18:39:59 +08:00
committed by GitHub
parent edfd5ccb29 d6f2972429
commit ce73479c60
6 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/libslic3r/AppConfig.cpp
View File

@@ -1441,11 +1441,12 @@ std::string AppConfig::config_path()
std::string AppConfig::get_preset_upgrade_url() std::string AppConfig::get_preset_upgrade_url()
{ {
std::string localLanguage = get("language"); std::string localLanguage = get("language");
//("/upgrade/orca/win/"); if (localLanguage != "zh_CN")
std::string url = APP_UPDATE_URL_BASE_EN + PROFILE_UPDATE_URL + std::string("version.json"); localLanguage = "en";
auto countryArea = get_country_code(); std::string url = APP_UPDATE_URL_BASE_EN + PROFILE_UPDATE_URL + localLanguage + std::string("/version.json");
auto countryArea = get_country_code();
if (countryArea == std::string("CN")) if (countryArea == std::string("CN"))
url = APP_UPDATE_URL_BASE_CN + PROFILE_UPDATE_URL + std::string("version.json"); url = APP_UPDATE_URL_BASE_CN + PROFILE_UPDATE_URL + localLanguage + std::string("/version.json");
return url; return url;
} }
@@ -1453,10 +1454,12 @@ std::string AppConfig::get_preset_upgrade_url()
std::string AppConfig::get_web_resource_upgrade_url() std::string AppConfig::get_web_resource_upgrade_url()
{ {
std::string localLanguage = get("language"); std::string localLanguage = get("language");
std::string url = APP_UPDATE_URL_BASE_EN + FLUTTER_UPDATE_URL + std::string("version.json"); if (localLanguage != "zh_CN")
auto countryArea = get_country_code(); localLanguage = "en";
std::string url = APP_UPDATE_URL_BASE_EN + FLUTTER_UPDATE_URL + localLanguage + std::string("/version.json");
auto countryArea = get_country_code();
if (countryArea == std::string("CN")) if (countryArea == std::string("CN"))
url = APP_UPDATE_URL_BASE_CN + FLUTTER_UPDATE_URL + std::string("version.json"); url = APP_UPDATE_URL_BASE_CN + FLUTTER_UPDATE_URL + localLanguage + std::string("/version.json");
return url; return url;
} }
@@ -1465,7 +1468,9 @@ std::string AppConfig::get_version_upgrade_url(bool stable_only /* = false*/)
{ {
//get local area and get the resource from diff server //get local area and get the resource from diff server
std::string localLanguage = get("language"); std::string localLanguage = get("language");
std::string url = APP_UPDATE_URL_BASE_EN + APP_UPDATE_URL + localLanguage + std::string("/version.json"); if (localLanguage != "zh_CN")
localLanguage = "en";
std::string url = APP_UPDATE_URL_BASE_EN + APP_UPDATE_URL + localLanguage + std::string("/version.json");
auto countryArea = get_country_code(); auto countryArea = get_country_code();
if (countryArea == std::string("CN")) if (countryArea == std::string("CN"))
url = APP_UPDATE_URL_BASE_CN + APP_UPDATE_URL + localLanguage + std::string("/version.json"); url = APP_UPDATE_URL_BASE_CN + APP_UPDATE_URL + localLanguage + std::string("/version.json");

2
src/sentry_wrapper/SentryWrapper.cpp
View File

@@ -127,7 +127,7 @@ static sentry_value_t before_send(sentry_value_t event, void* hint, void* data)
void initSentryEx() void initSentryEx()
{ {
sentry_options_t* options = sentry_options_new(); sentry_options_t* options = sentry_options_new();
std::string dsn = std::string("https://c74b617c2aedc291444d3a238d23e780@o4508125599563776.ingest.us.sentry.io/4510425163956224"); std::string dsn = std::string("https://282935326eecb9758e7f84a2ad3ae0ab@o4508125599563776.ingest.us.sentry.io/4510425163956224");
{ {
sentry_options_set_dsn(options, dsn.c_str()); sentry_options_set_dsn(options, dsn.c_str());
std::string handlerDir = ""; std::string handlerDir = "";

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

@@ -2521,7 +2521,6 @@ bool GUI_App::on_init_inner()
UpdateVersionDialog dialog(this->mainframe); UpdateVersionDialog dialog(this->mainframe);
wxString extmsg = wxString::FromUTF8(version_info.description); wxString extmsg = wxString::FromUTF8(version_info.description);
dialog.update_version_info(extmsg, version_info.version_str); dialog.update_version_info(extmsg, version_info.version_str);
//dialog.update_version_info(version_info.description);
if (evt.GetInt() != 0) { if (evt.GetInt() != 0) {
dialog.m_button_skip_version->Hide(); dialog.m_button_skip_version->Hide();
} }
@@ -2561,6 +2560,9 @@ bool GUI_App::on_init_inner()
case wxID_NO: case wxID_NO:
wxGetApp().mainframe->Close(true); wxGetApp().mainframe->Close(true);
break; break;
case wxID_CANCEL:
wxGetApp().mainframe->Close(true);
break;
default: default:
wxGetApp().mainframe->Close(true); wxGetApp().mainframe->Close(true);
} }
@@ -4860,6 +4862,7 @@ void GUI_App::check_new_version_sf(bool show_tips, bool by_user)
return; return;
} }
//if (true)
if (isForceUpgrade) if (isForceUpgrade)
{ {
wxGetApp().app_config->set_bool("force_upgrade", version_info.force_upgrade); wxGetApp().app_config->set_bool("force_upgrade", version_info.force_upgrade);

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

@@ -2298,7 +2298,7 @@ static wxMenu* generate_help_menu()
}); });
append_menu_item( append_menu_item(
helpMenu, wxID_ANY, _L("Check for Preset Update"), _L("Check for Preset Update"), helpMenu, wxID_ANY, _L("Check for Process Preset Updates"), _L("Check for Process Preset Updates"),
[](wxCommandEvent&) { [](wxCommandEvent&) {
wxGetApp().check_preset_version(); wxGetApp().check_preset_version();
@@ -2306,7 +2306,7 @@ static wxMenu* generate_help_menu()
"", nullptr, []() { return true; }); "", nullptr, []() { return true; });
append_menu_item( append_menu_item(
helpMenu, wxID_ANY, _L("Check for Web Update"), _L("Check for Web Update"), helpMenu, wxID_ANY, _L("Check for Web ResourceUpdates"), _L("Check for Web ResourceUpdates"),
[](wxCommandEvent&) { [](wxCommandEvent&) {
wxGetApp().check_web_version(); wxGetApp().check_web_version();
}, },

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

@@ -441,7 +441,7 @@ DownloadDialog::DownloadDialog(wxWindow *parent, const wxString &msg, const wxSt
: MsgDialog(parent, title, msg, style), msg(msg) : MsgDialog(parent, title, msg, style), msg(msg)
{ {
add_button(wxID_YES, true, _L("Download")); add_button(wxID_YES, true, _L("Download"));
add_button(wxID_CANCEL, true, _L("Skip")); //add_button(wxID_CANCEL, true, _L("Skip"));
finalize(); finalize();
} }

15
src/slic3r/GUI/ReleaseNote.cpp
View File

@@ -96,7 +96,6 @@ ReleaseNoteDialog::ReleaseNoteDialog(Plater *plater /*= nullptr*/)
ReleaseNoteDialog::~ReleaseNoteDialog() {} ReleaseNoteDialog::~ReleaseNoteDialog() {}
void ReleaseNoteDialog::on_dpi_changed(const wxRect &suggested_rect) void ReleaseNoteDialog::on_dpi_changed(const wxRect &suggested_rect)
{ {
} }
@@ -129,19 +128,14 @@ UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/)
m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(30)); m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(30));
wxBoxSizer* m_sizer_body = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* m_sizer_body = new wxBoxSizer(wxHORIZONTAL);
auto sm = create_scaled_bitmap("Snapmaker_Orca", nullptr, 55); auto sm = create_scaled_bitmap("Snapmaker_Orca", nullptr, 55);
auto brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(55), FromDIP(55))); auto brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(55), FromDIP(55)));
wxBoxSizer* m_sizer_right = new wxBoxSizer(wxVERTICAL); wxBoxSizer* m_sizer_right = new wxBoxSizer(wxVERTICAL);
m_text_up_info = new Label(this, Label::Head_13, wxEmptyString, LB_AUTO_WRAP); m_text_up_info = new Label(this, Label::Head_13, wxEmptyString, LB_AUTO_WRAP);
m_text_up_info->SetMaxSize(wxSize(FromDIP(260), -1)); m_text_up_info->SetMaxSize(wxSize(FromDIP(260), -1));
m_text_up_info->SetForegroundColour(wxColour(0x26, 0x2E, 0x30)); m_text_up_info->SetForegroundColour(wxColour(0x26, 0x2E, 0x30));
operation_tips = new ::Label(this, Label::Body_12, _L("Click OK to update the Network plug-in when Snapmaker Orca launches next time."), LB_AUTO_WRAP); operation_tips = new ::Label(this, Label::Body_12, _L("Click OK to update the Network plug-in when Snapmaker Orca launches next time."), LB_AUTO_WRAP);
operation_tips->SetMinSize(wxSize(FromDIP(260), -1)); operation_tips->SetMinSize(wxSize(FromDIP(260), -1));
operation_tips->SetMaxSize(wxSize(FromDIP(260), -1)); operation_tips->SetMaxSize(wxSize(FromDIP(260), -1));
@@ -213,7 +207,6 @@ UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/)
UpdatePluginDialog::~UpdatePluginDialog() {} UpdatePluginDialog::~UpdatePluginDialog() {}
void UpdatePluginDialog::on_dpi_changed(const wxRect& suggested_rect) void UpdatePluginDialog::on_dpi_changed(const wxRect& suggested_rect)
{ {
} }
@@ -269,18 +262,11 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1)); auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1));
m_line_top->SetBackgroundColour(wxColour(166, 169, 170)); m_line_top->SetBackgroundColour(wxColour(166, 169, 170));
wxBoxSizer *m_sizer_body = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *m_sizer_body = new wxBoxSizer(wxHORIZONTAL);
auto sm = create_scaled_bitmap("Snapmaker_Orca", nullptr, 70); auto sm = create_scaled_bitmap("Snapmaker_Orca", nullptr, 70);
m_brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(70), FromDIP(70))); m_brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(70), FromDIP(70)));
wxBoxSizer *m_sizer_right = new wxBoxSizer(wxVERTICAL); wxBoxSizer *m_sizer_right = new wxBoxSizer(wxVERTICAL);
m_text_up_info = new Label(this, Label::Head_14, wxEmptyString, LB_AUTO_WRAP); m_text_up_info = new Label(this, Label::Head_14, wxEmptyString, LB_AUTO_WRAP);
m_text_up_info->SetForegroundColour(wxColour(0x26, 0x2E, 0x30)); m_text_up_info->SetForegroundColour(wxColour(0x26, 0x2E, 0x30));
@@ -424,7 +410,6 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
UpdateVersionDialog::~UpdateVersionDialog() {} UpdateVersionDialog::~UpdateVersionDialog() {}
wxWebView* UpdateVersionDialog::CreateTipView(wxWindow* parent) wxWebView* UpdateVersionDialog::CreateTipView(wxWindow* parent)
{ {
wxWebView* tipView = WebView::CreateWebView(parent, ""); wxWebView* tipView = WebView::CreateWebView(parent, "");