mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:Use url links to display Releasenote 

Change-Id: Ib57931d71702d1356b10bd4c665017b3331189aa
This commit is contained in:
tao wang 2022-09-23 11:47:14 +08:00 committed by Lane.Wei
parent 42e08b5414
commit ecc76d0f33
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2019,8 +2019,8 @@ bool GUI_App::on_init_inner()
if (!skip_this_version if (!skip_this_version
|| evt.GetInt() != 0) { || evt.GetInt() != 0) {
UpdateVersionDialog dialog(this->mainframe); 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) { if (evt.GetInt() != 0) {
dialog.m_remind_choice->Hide(); dialog.m_remind_choice->Hide();
} }

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

@ -272,7 +272,7 @@ void UpdateVersionDialog::on_dpi_changed(const wxRect &suggested_rect) {
m_button_cancel->Rescale(); 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)); /*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); 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); 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->SetSizer(sizer_text_release_note);
m_scrollwindw_release_note->Layout();*/ 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 }} // namespace Slic3r::GUI

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

@ -63,7 +63,7 @@ public:
bool ShowReleaseNote(std::string content); bool ShowReleaseNote(std::string content);
void RunScript(std::string script); void RunScript(std::string script);
void on_dpi_changed(const wxRect& suggested_rect) override; 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); void alter_choice(wxCommandEvent& event);
wxStaticText * m_text_up_info{nullptr}; wxStaticText * m_text_up_info{nullptr};