3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

formating of forced update dialog

Browse source
This commit is contained in:
David Kocik 2020-02-06 11:32:45 +01:00
parent adf60d5931
commit e21c5b2418
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/slic3r/GUI/UpdateDialogs.cpp
View file

@ -162,24 +162,20 @@ MsgUpdateForced::MsgUpdateForced(const std::vector<Update>& updates) :
const auto lang_code = wxGetApp().current_language_code_safe().ToStdString(); const auto lang_code = wxGetApp().current_language_code_safe().ToStdString();
auto* versions = new wxBoxSizer(wxVERTICAL); auto* versions = new wxFlexGridSizer(2, 0, VERT_SPACING);
for (const auto& update : updates) { for (const auto& update : updates) {
auto* flex = new wxFlexGridSizer(2, 0, VERT_SPACING);
auto* text_vendor = new wxStaticText(this, wxID_ANY, update.vendor); auto* text_vendor = new wxStaticText(this, wxID_ANY, update.vendor);
text_vendor->SetFont(boldfont); text_vendor->SetFont(boldfont);
flex->Add(text_vendor); versions->Add(text_vendor);
flex->Add(new wxStaticText(this, wxID_ANY, update.version.to_string())); versions->Add(new wxStaticText(this, wxID_ANY, update.version.to_string()));
if (!update.comment.empty()) { if (!update.comment.empty()) {
flex->Add(new wxStaticText(this, wxID_ANY, _(L("Comment:"))), 0, wxALIGN_RIGHT); versions->Add(new wxStaticText(this, wxID_ANY, _(L("Comment:")))/*, 0, wxALIGN_RIGHT*/);//uncoment if align to right (might not look good if 1 vedor name is longer than other names)
auto* update_comment = new wxStaticText(this, wxID_ANY, from_u8(update.comment)); auto* update_comment = new wxStaticText(this, wxID_ANY, from_u8(update.comment));
update_comment->Wrap(CONTENT_WIDTH * wxGetApp().em_unit()); update_comment->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
flex->Add(update_comment); versions->Add(update_comment);
} }
versions->Add(flex);
if (!update.changelog_url.empty() && update.version.prerelease() == nullptr) { if (!update.changelog_url.empty() && update.version.prerelease() == nullptr) {
auto* line = new wxBoxSizer(wxHORIZONTAL); auto* line = new wxBoxSizer(wxHORIZONTAL);
auto changelog_url = (boost::format(update.changelog_url) % lang_code).str(); auto changelog_url = (boost::format(update.changelog_url) % lang_code).str();