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

Improve the look of new version release notes (#12229)

Browse Source 
# Description
Adds md4c to parse release notes to HTML

# Screenshots/Recordings/Graphs

<img width="691" height="574" alt="image" src="https://github.com/user-attachments/assets/1ecd9bf4-6e26-4702-880e-c6f585c145ce" />


## Tests

Tested on Windows
This commit is contained in:
Ocraftyone
2026-02-10 00:53:11 -05:00
committed by GitHub
parent abefb0e698
commit 38e67ff090
4 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/CMakeLists.txt
View File

@@ -736,7 +736,7 @@ else()
set(_opengl_link_lib OpenGL::GL) set(_opengl_link_lib OpenGL::GL)
endif() endif()
target_link_libraries(libslic3r_gui libslic3r cereal::cereal imgui imguizmo minilzo libvgcode GLEW::GLEW OpenGL::GL hidapi ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto noise::noise) target_link_libraries(libslic3r_gui libslic3r cereal::cereal imgui imguizmo minilzo libvgcode md4c-html GLEW::GLEW OpenGL::GL hidapi ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto noise::noise)
if (MSVC) if (MSVC)

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

@@ -5423,7 +5423,7 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user)
} }
version_info.url = prefer_release ? best_release_url : best_pre_url; version_info.url = prefer_release ? best_release_url : best_pre_url;
version_info.version_str = prefer_release ? best_release.to_string_sf() : best_pre.to_string(); version_info.version_str = prefer_release ? best_release.to_string_sf() : best_pre.to_string_sf();
version_info.description = prefer_release ? best_release_content : best_pre_content; version_info.description = prefer_release ? best_release_content : best_pre_content;
version_info.force_upgrade = false; version_info.force_upgrade = false;

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

@@ -27,6 +27,7 @@
#include "DeviceCore/DevManager.h" #include "DeviceCore/DevManager.h"
#include "DeviceCore/DevStorage.h" #include "DeviceCore/DevStorage.h"
#include "md4c/src/md4c-html.h"
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {
@@ -268,32 +269,31 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
//webview //webview
m_vebview_release_note = CreateTipView(m_simplebook_release_note); m_vebview_release_note = CreateTipView(m_simplebook_release_note);
m_vebview_release_note->SetBackgroundColour(wxColour(0xF8, 0xF8, 0xF8));
m_vebview_release_note->SetSize(wxSize(FromDIP(560), FromDIP(430))); m_vebview_release_note->SetSize(wxSize(FromDIP(560), FromDIP(430)));
m_vebview_release_note->SetMinSize(wxSize(FromDIP(560), FromDIP(430))); m_vebview_release_note->SetMinSize(wxSize(FromDIP(560), FromDIP(430)));
//m_vebview_release_note->SetMaxSize(wxSize(FromDIP(560), FromDIP(430))); //m_vebview_release_note->SetMaxSize(wxSize(FromDIP(560), FromDIP(430)));
m_vebview_release_note->Bind(wxEVT_WEBVIEW_NAVIGATING,[=](wxWebViewEvent& event){
static bool load_url_first = false; m_vebview_release_note->Bind(wxEVT_WEBVIEW_NAVIGATING,[=, count = 0](wxWebViewEvent& event) mutable {
if(load_url_first){ count++;
// Orca: not used in Orca Slicer if (count == 1) {
// wxLaunchDefaultBrowser(url_line); m_vebview_release_note->SetPage(wxString::FromUTF8(html_source), "");
} else if (count >= 3) {
// Launch the default browser for links clicked by the user
wxLaunchDefaultBrowser(event.GetURL());
event.Veto(); event.Veto();
}else{
load_url_first = true;
} }
}); });
fs::path ph(data_dir()); // fs::path ph(data_dir());
ph /= "resources/tooltip/releasenote.html"; // ph /= "resources/tooltip/releasenote.html";
if (!fs::exists(ph)) { // if (!fs::exists(ph)) {
ph = resources_dir(); // ph = resources_dir();
ph /= "tooltip/releasenote.html"; // ph /= "tooltip/releasenote.html";
} // }
auto url = ph.string(); // auto url = ph.string();
std::replace(url.begin(), url.end(), '\\', '/'); // std::replace(url.begin(), url.end(), '\\', '/');
url = "file:///" + url; // url = "file:///" + url;
m_vebview_release_note->LoadURL(from_u8(url)); // m_vebview_release_note->LoadURL(from_u8(url));
m_simplebook_release_note->AddPage(m_scrollwindows_release_note, wxEmptyString, false); m_simplebook_release_note->AddPage(m_scrollwindows_release_note, wxEmptyString, false);
m_simplebook_release_note->AddPage(m_vebview_release_note, wxEmptyString, false); m_simplebook_release_note->AddPage(m_vebview_release_note, wxEmptyString, false);
@@ -470,27 +470,31 @@ void UpdateVersionDialog::update_version_info(wxString release_note, wxString ve
// } // }
// } // }
if (use_web_link) { // if (use_web_link) {
m_brand->Hide(); // m_brand->Hide();
m_text_up_info->Hide(); // m_text_up_info->Hide();
m_simplebook_release_note->SetSelection(1); // m_simplebook_release_note->SetSelection(1);
m_vebview_release_note->LoadURL(from_u8(url_line)); // m_vebview_release_note->LoadURL(from_u8(url_line));
} // }
else { // else {
m_simplebook_release_note->SetMaxSize(wxSize(FromDIP(560), FromDIP(430))); m_simplebook_release_note->SetMaxSize(wxSize(FromDIP(560), FromDIP(430)));
m_simplebook_release_note->SetSelection(0); m_simplebook_release_note->SetSelection(1);
m_text_up_info->SetLabel(wxString::Format(_L("Click to download new version in default browser: %s"), version)); m_text_up_info->SetLabel(wxString::Format(_L("Click to download new version in default browser: %s"), version));
wxBoxSizer* sizer_text_release_note = new wxBoxSizer(wxVERTICAL); auto data_buf_in = release_note.utf8_str();
auto m_staticText_release_note = new ::Label(m_scrollwindows_release_note, release_note, LB_AUTO_WRAP); auto bg_color = StateColor::darkModeColorFor(*wxWHITE).GetAsString();
m_staticText_release_note->SetMinSize(wxSize(FromDIP(560), -1)); auto fg_color = StateColor::darkModeColorFor(*wxBLACK).GetAsString();
m_staticText_release_note->SetMaxSize(wxSize(FromDIP(560), -1)); html_source = (boost::format("<html><head><style>body { color: %1%; background-color: %2%; } a { color: #1E90FF }</style></head><body>")
sizer_text_release_note->Add(m_staticText_release_note, 0, wxALL, 5); % fg_color % bg_color).str();
m_scrollwindows_release_note->SetSizer(sizer_text_release_note); md_html(data_buf_in.data(), data_buf_in.length(), [](const MD_CHAR* text, MD_SIZE size, void* userdata) {
m_scrollwindows_release_note->Layout(); std::string* out_buf = (std::string*)userdata;
m_scrollwindows_release_note->Fit(); out_buf->append(text, size);
SetMinSize(GetSize()); }, (void*) &html_source, MD_DIALECT_GITHUB | MD_FLAG_STRIKETHROUGH | MD_FLAG_WIKILINKS, 0);
SetMaxSize(GetSize()); html_source.append("</body></html>");
} m_vebview_release_note->LoadURL("file://" + (boost::filesystem::path (resources_dir()) / "web/guide/0/index.html").string());
SetMinSize(GetSize());
SetMaxSize(GetSize());
// }
wxGetApp().UpdateDlgDarkUI(this); wxGetApp().UpdateDlgDarkUI(this);
Layout(); Layout();

1
src/slic3r/GUI/ReleaseNote.hpp
View File

@@ -107,6 +107,7 @@ public:
Button* m_button_download; Button* m_button_download;
Button* m_button_cancel; Button* m_button_cancel;
std::string url_line; std::string url_line;
std::string html_source;
}; };
class SecondaryCheckDialog : public DPIFrame class SecondaryCheckDialog : public DPIFrame