amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

FIX: fix display error in release note

Browse source 
Change-Id: I71edf47b4b48ce5ae310b8633fe351318f8f24ef
This commit is contained in:
Stone Li 2022-08-11 16:08:29 +08:00 committed by Lane.Wei
parent 73e4078348
commit 816dae015b
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/ReleaseNote.cpp
View file

@ -79,7 +79,7 @@ void ReleaseNoteDialog::on_dpi_changed(const wxRect &suggested_rect)
{
}
void ReleaseNoteDialog::update_release_note(std::string release_note, std::string version)
void ReleaseNoteDialog::update_release_note(wxString release_note, std::string version)
{
m_text_up_info->SetLabel(wxString::Format("version %s update information :", version));
wxBoxSizer * sizer_text_release_note = new wxBoxSizer(wxVERTICAL);

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

@ -43,7 +43,7 @@ public:
~ReleaseNoteDialog();
void on_dpi_changed(const wxRect &suggested_rect) override;
void update_release_note(std::string release_note, std::string version);
void update_release_note(wxString release_note, std::string version);
wxStaticText * m_text_up_info{nullptr};
wxScrolledWindow *m_scrollwindw_release_note {nullptr};

8
src/slic3r/GUI/UpgradePanel.cpp
View file

@ -519,18 +519,18 @@ void MachineInfoPanel::on_show_release_note(wxMouseEvent &event)
if (!dev) return;
std::string next_version_release_note = "";
std::string now_version_release_note = "";
wxString next_version_release_note;
wxString now_version_release_note;
std::string version_number = "";
for (auto iter : m_obj->firmware_list) {
if (iter.version == m_obj->ota_new_version_number) {
version_number = m_obj->ota_new_version_number;
next_version_release_note = iter.description;
next_version_release_note = wxString::FromUTF8(iter.description);
}
if (iter.version == m_obj->get_ota_version()) {
version_number = m_obj->get_ota_version();
now_version_release_note = iter.description;
now_version_release_note = wxString::FromUTF8(iter.description);
}
}