diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index c2c16142ca..de8814679e 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -1441,11 +1441,12 @@ std::string AppConfig::config_path() std::string AppConfig::get_preset_upgrade_url() { std::string localLanguage = get("language"); - //("/upgrade/orca/win/"); - std::string url = APP_UPDATE_URL_BASE_EN + PROFILE_UPDATE_URL + std::string("version.json"); - auto countryArea = get_country_code(); + if (localLanguage != "zh_CN") + localLanguage = "en"; + 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")) - 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; } @@ -1453,10 +1454,12 @@ std::string AppConfig::get_preset_upgrade_url() std::string AppConfig::get_web_resource_upgrade_url() { std::string localLanguage = get("language"); - std::string url = APP_UPDATE_URL_BASE_EN + FLUTTER_UPDATE_URL + std::string("version.json"); - auto countryArea = get_country_code(); + if (localLanguage != "zh_CN") + 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")) - 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; } @@ -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 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(); if (countryArea == std::string("CN")) url = APP_UPDATE_URL_BASE_CN + APP_UPDATE_URL + localLanguage + std::string("/version.json"); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index d6760551f9..b528aab5df 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2549,7 +2549,7 @@ bool GUI_App::on_init_inner() false, wxCENTER | wxICON_INFORMATION); dialog.SetExtendedMessage(description_text); - + int result = dialog.ShowModal(); switch (result) { @@ -4862,6 +4862,7 @@ void GUI_App::check_new_version_sf(bool show_tips, bool by_user) return; } + //if (true) if (isForceUpgrade) { wxGetApp().app_config->set_bool("force_upgrade", version_info.force_upgrade); diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 94c67c8d20..2eb43b2cfd 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -2298,7 +2298,7 @@ static wxMenu* generate_help_menu() }); 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&) { wxGetApp().check_preset_version(); @@ -2306,7 +2306,7 @@ static wxMenu* generate_help_menu() "", nullptr, []() { return true; }); 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&) { wxGetApp().check_web_version(); }, diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index b7d9b63e8b..31cff49156 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -441,7 +441,7 @@ DownloadDialog::DownloadDialog(wxWindow *parent, const wxString &msg, const wxSt : MsgDialog(parent, title, msg, style), msg(msg) { add_button(wxID_YES, true, _L("Download")); - add_button(wxID_CANCEL, true, _L("Skip")); + //add_button(wxID_CANCEL, true, _L("Skip")); finalize(); }