From ecc76d0f3370501dfb99c92884e34c602b01d76e Mon Sep 17 00:00:00 2001
From: tao wang <tao.wang@bambulab.com>
Date: Fri, 23 Sep 2022 11:47:14 +0800
Subject: [PATCH] FIX:Use url links to display Releasenote

Change-Id: Ib57931d71702d1356b10bd4c665017b3331189aa
---
 src/slic3r/GUI/GUI_App.cpp     |  4 ++--
 src/slic3r/GUI/ReleaseNote.cpp | 19 ++++++++++++++++++-
 src/slic3r/GUI/ReleaseNote.hpp |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 1f4e78d5a..ee6e2c134 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -2019,8 +2019,8 @@ bool GUI_App::on_init_inner()
                 if (!skip_this_version
                     || evt.GetInt() != 0) {
                     UpdateVersionDialog dialog(this->mainframe);
-                    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) {
                         dialog.m_remind_choice->Hide();
                     }
diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp
index e73a9851f..6b576d9bd 100644
--- a/src/slic3r/GUI/ReleaseNote.cpp
+++ b/src/slic3r/GUI/ReleaseNote.cpp
@@ -272,7 +272,7 @@ void UpdateVersionDialog::on_dpi_changed(const wxRect &suggested_rect) {
     m_button_cancel->Rescale();
 }
 
-void UpdateVersionDialog::update_version_info(wxString release_note, wxString version)
+void UpdateVersionDialog::update_version_info(std::string url)
 { 
    /*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);
@@ -281,6 +281,23 @@ void UpdateVersionDialog::update_version_info(wxString release_note, wxString ve
     sizer_text_release_note->Add(m_staticText_release_note, 0, wxALL, 5);
     m_scrollwindw_release_note->SetSizer(sizer_text_release_note);
     m_scrollwindw_release_note->Layout();*/
+
+    if (url.empty()) {
+		fs::path ph(data_dir());
+		ph /= "resources/tooltip/common/releasenote.html";
+		if (!fs::exists(ph)) {
+			ph = resources_dir();
+			ph /= "tooltip/releasenote.html";
+		}
+		auto url = ph.string();
+		std::replace(url.begin(), url.end(), '\\', '/');
+		url = "file:///" + url;
+		m_scrollwindw_release_note->LoadURL(from_u8(url));
+    }
+    else {
+        m_scrollwindw_release_note->LoadURL(from_u8(url));
+    }
+    
 }
 
  }} // namespace Slic3r::GUI
diff --git a/src/slic3r/GUI/ReleaseNote.hpp b/src/slic3r/GUI/ReleaseNote.hpp
index c42b0d6f7..e78240094 100644
--- a/src/slic3r/GUI/ReleaseNote.hpp
+++ b/src/slic3r/GUI/ReleaseNote.hpp
@@ -63,7 +63,7 @@ public:
     bool ShowReleaseNote(std::string content);
     void RunScript(std::string script);
     void on_dpi_changed(const wxRect& suggested_rect) override;
-    void update_version_info(wxString release_note, wxString version);
+    void update_version_info(std::string url);
     void alter_choice(wxCommandEvent& event);
 
     wxStaticText *    m_text_up_info{nullptr};