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

feature diff country on local area for update preset web resource.

Browse Source
This commit is contained in:
alves
2026-01-16 17:54:33 +08:00
parent f374b14ea0
commit d6f2972429
4 changed files with 18 additions and 12 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");

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

@@ -2549,7 +2549,7 @@ bool GUI_App::on_init_inner()
false, false,
wxCENTER | wxICON_INFORMATION); wxCENTER | wxICON_INFORMATION);
dialog.SetExtendedMessage(description_text); dialog.SetExtendedMessage(description_text);
int result = dialog.ShowModal(); int result = dialog.ShowModal();
switch (result) switch (result)
{ {
@@ -4862,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();
} }