From 951eb8ef72a27b20c912d8e9ab1209679515d913 Mon Sep 17 00:00:00 2001 From: Victor Usoltsev Date: Thu, 10 Oct 2024 23:30:39 +1300 Subject: [PATCH] Differentiates beta releases. Always shows release notes as text. --- src/slic3r/GUI/GUI_App.cpp | 2 -- src/slic3r/GUI/ReleaseNote.cpp | 29 ++++++++++++++--------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 4415118af5d..478e3f42208 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -4280,7 +4280,6 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user) best_pre = tag_version; best_pre_url = root.get("html_url"); best_pre_content = root.get("body"); - best_pre.set_prerelease("Preview"); } } else { if (best_release < tag_version) { @@ -4302,7 +4301,6 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user) best_pre = tag_version; best_pre_url = json_version.second.get("html_url"); best_pre_content = json_version.second.get("body"); - best_pre.set_prerelease("Preview"); } } else { if (best_release < tag_version) { diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 617397f32f1..331711a823c 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -502,21 +502,20 @@ std::vector UpdateVersionDialog::splitWithStl(std::string str,std:: void UpdateVersionDialog::update_version_info(wxString release_note, wxString version) { //bbs check whether the web display is used - bool use_web_link = false; - url_line = ""; - auto split_array = splitWithStl(release_note.ToStdString(), "###"); - - if (split_array.size() >= 3) { - for (auto i = 0; i < split_array.size(); i++) { - std::string url = split_array[i]; - if (std::strstr(url.c_str(), "http://") != NULL || std::strstr(url.c_str(), "https://") != NULL) { - use_web_link = true; - url_line = url; - break; - } - } - } - + bool use_web_link = false; + url_line = ""; + // Orca: not used in Orca Slicer + // auto split_array = splitWithStl(release_note.ToStdString(), "###"); + // if (split_array.size() >= 3) { + // for (auto i = 0; i < split_array.size(); i++) { + // std::string url = split_array[i]; + // if (std::strstr(url.c_str(), "http://") != NULL || std::strstr(url.c_str(), "https://") != NULL) { + // use_web_link = true; + // url_line = url; + // break; + // } + // } + // } if (use_web_link) { m_brand->Hide();