3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-15 02:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ENH:optimize the foreground color of release note text

Browse source 
Change-Id: I48f6b1257fed3b1bba085eee2700060dba7c0705
This commit is contained in:
tao wang 2023-01-29 11:46:19 +08:00 • committed by Lane.Wei
parent 563342c450
commit b144aae5bd
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,13 +93,15 @@ void ReleaseNoteDialog::update_release_note(wxString release_note, std::string v
{ {
m_text_up_info->SetLabel(wxString::Format(_L("version %s update information :"), version)); m_text_up_info->SetLabel(wxString::Format(_L("version %s update information :"), version));
wxBoxSizer * sizer_text_release_note = new wxBoxSizer(wxVERTICAL); wxBoxSizer * sizer_text_release_note = new wxBoxSizer(wxVERTICAL);
auto m_staticText_release_note = new wxStaticText(m_vebview_release_note, wxID_ANY, release_note, wxDefaultPosition, wxDefaultSize, 0); auto m_staticText_release_note = new ::Label(m_vebview_release_note, release_note);
m_staticText_release_note->SetForegroundColour(*wxBLACK); m_staticText_release_note->SetMinSize(wxSize(FromDIP(530), -1));
m_staticText_release_note->SetMaxSize(wxSize(FromDIP(530), -1));
m_staticText_release_note->Wrap(FromDIP(530)); m_staticText_release_note->Wrap(FromDIP(530));
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_vebview_release_note->SetSizer(sizer_text_release_note); m_vebview_release_note->SetSizer(sizer_text_release_note);
m_vebview_release_note->Layout(); m_vebview_release_note->Layout();
m_vebview_release_note->Fit(); m_vebview_release_note->Fit();
wxGetApp().UpdateDlgDarkUI(this);
} }
UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/) UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/)
@ -133,10 +135,9 @@ UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/)
operation_tips = new ::Label(this, _L("Click OK to update the Network plug-in when Bambu Studio launches next time.")); operation_tips = new ::Label(this, _L("Click OK to update the Network plug-in when Bambu Studio launches next time."));
operation_tips->SetFont(::Label::Body_12); operation_tips->SetFont(::Label::Body_12);
operation_tips->SetSize(wxSize(FromDIP(260), -1)); operation_tips->SetMinSize(wxSize(FromDIP(260), -1));
operation_tips->SetMaxSize(wxSize(FromDIP(260), -1));
operation_tips->Wrap(FromDIP(260)); operation_tips->Wrap(FromDIP(260));
operation_tips->SetForegroundColour(*wxBLACK);
m_vebview_release_note = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL); m_vebview_release_note = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL);
m_vebview_release_note->SetScrollRate(5, 5); m_vebview_release_note->SetScrollRate(5, 5);
@ -224,8 +225,8 @@ void UpdatePluginDialog::update_info(std::string json_path)
version_str = j["version"]; version_str = j["version"];
description_str = j["description"]; description_str = j["description"];
} }
catch(nlohmann::detail::parse_error &err) { catch (nlohmann::detail::parse_error& err) {
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< ": parse "<<json_path<<" got a nlohmann::detail::parse_error, reason = " << err.what(); BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": parse " << json_path << " got a nlohmann::detail::parse_error, reason = " << err.what();
return; return;
} }
@ -233,12 +234,13 @@ void UpdatePluginDialog::update_info(std::string json_path)
description = from_u8(description_str); description = from_u8(description_str);
m_text_up_info->SetLabel(wxString::Format(_L("A new Network plug-in(%s) available, Do you want to install it?"), version)); m_text_up_info->SetLabel(wxString::Format(_L("A new Network plug-in(%s) available, Do you want to install it?"), version));
m_text_up_info->SetMinSize(wxSize(FromDIP(260), -1));
m_text_up_info->SetMaxSize(wxSize(FromDIP(260), -1)); m_text_up_info->SetMaxSize(wxSize(FromDIP(260), -1));
m_text_up_info->Wrap(FromDIP(260)); m_text_up_info->Wrap(FromDIP(260));
wxBoxSizer* sizer_text_release_note = new wxBoxSizer(wxVERTICAL); wxBoxSizer* sizer_text_release_note = new wxBoxSizer(wxVERTICAL);
auto m_text_label = new ::Label(m_vebview_release_note, description); auto m_text_label = new ::Label(m_vebview_release_note, description);
m_text_label->SetFont(::Label::Body_13); m_text_label->SetFont(::Label::Body_13);
m_text_label->SetForegroundColour(*wxBLACK); m_text_label->SetMinSize(wxSize(FromDIP(235), -1));
m_text_label->SetMaxSize(wxSize(FromDIP(235), -1)); m_text_label->SetMaxSize(wxSize(FromDIP(235), -1));
m_text_label->Wrap(FromDIP(235)); m_text_label->Wrap(FromDIP(235));
@ -246,6 +248,7 @@ void UpdatePluginDialog::update_info(std::string json_path)
m_vebview_release_note->SetSizer(sizer_text_release_note); m_vebview_release_note->SetSizer(sizer_text_release_note);
m_vebview_release_note->Layout(); m_vebview_release_note->Layout();
m_vebview_release_note->Fit(); m_vebview_release_note->Fit();
wxGetApp().UpdateDlgDarkUI(this);
Layout(); Layout();
Fit(); Fit();
} }
@ -297,6 +300,7 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
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)));
fs::path ph(data_dir()); fs::path ph(data_dir());
ph /= "resources/tooltip/common/releasenote.html"; ph /= "resources/tooltip/common/releasenote.html";
if (!fs::exists(ph)) { if (!fs::exists(ph)) {
@ -496,8 +500,9 @@ void UpdateVersionDialog::update_version_info(wxString release_note, wxString ve
m_simplebook_release_note->SetSelection(0); m_simplebook_release_note->SetSelection(0);
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);
auto m_staticText_release_note = new wxStaticText(m_scrollwindows_release_note, wxID_ANY, release_note, wxDefaultPosition, wxDefaultSize, 0); auto m_staticText_release_note = new ::Label(m_scrollwindows_release_note, release_note);
m_staticText_release_note->SetForegroundColour(*wxBLACK); m_staticText_release_note->SetMinSize(wxSize(FromDIP(560), -1));
m_staticText_release_note->SetMaxSize(wxSize(FromDIP(560), -1));
m_staticText_release_note->Wrap(FromDIP(530)); m_staticText_release_note->Wrap(FromDIP(530));
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_scrollwindows_release_note->SetSizer(sizer_text_release_note); m_scrollwindows_release_note->SetSizer(sizer_text_release_note);
@ -506,6 +511,8 @@ void UpdateVersionDialog::update_version_info(wxString release_note, wxString ve
SetMinSize(GetSize()); SetMinSize(GetSize());
SetMaxSize(GetSize()); SetMaxSize(GetSize());
} }
wxGetApp().UpdateDlgDarkUI(this);
Layout(); Layout();
Fit(); Fit();
} }