diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index b0e458f53..33ac4def7 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -57,10 +57,10 @@ CopyrightsDialog::CopyrightsDialog() wxFont font = get_default_font(this); const int fs = font.GetPointSize(); - const int fs2 = static_cast(1.2f*fs); - int size[] = { fs, fs, fs, fs, fs2, fs2, fs2 }; + const int fs2 = static_cast(1.2F*fs); + std::array size = { fs, fs, fs, fs, fs2, fs2, fs2 }; - m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), size); + m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), size.cbegin()); m_html->SetBorders(2); m_html->SetPage(get_html_text()); @@ -259,8 +259,8 @@ AboutDialog::AboutDialog() auto bgr_clr_str = wxString::Format(wxT("#%02X%02X%02X"), bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue()); const int fs = font.GetPointSize()-1; - int size[] = {fs,fs,fs,fs,fs,fs,fs}; - m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), size); + std::array size = {fs,fs,fs,fs,fs,fs,fs}; + m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), size.cbegin()); m_html->SetBorders(2); const std::string copyright_str = _utf8(L("Copyright")); // TRN "Slic3r _is licensed under the_ License" diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 0a6d1bda6..c295c17a6 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -973,9 +973,6 @@ static wxMenu* generate_help_menu() [](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/slic3r/Slic3r/wiki"); }); append_menu_item(helpMenu, wxID_ANY, _L("Slic3r website"), _L("Open the Slic3r website in your browser"), [](wxCommandEvent&) { wxLaunchDefaultBrowser("http://slic3r.org"); }); - helpMenu->AppendSeparator(); - append_menu_item(helpMenu, wxID_ANY, _L("Prusa Edition website"), _L("Open the Prusa Edition website in your browser"), - [](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/prusa3d/PrusaSlicer"); }); //# my $versioncheck = $self->_append_menu_item($helpMenu, "Check for &Updates...", "Check for new Slic3r versions", sub{ //# wxTheApp->check_version(1); //# }); @@ -991,10 +988,11 @@ static wxMenu* generate_help_menu() if (wxGetApp().is_editor()) append_menu_item(helpMenu, wxID_ANY, wxString::Format(_L("&About %s"), SLIC3R_APP_NAME), _L("Show about dialog"), [](wxCommandEvent&) { Slic3r::GUI::about(); }); - else + else { append_menu_item(helpMenu, wxID_ANY, wxString::Format(_L("&About %s"), GCODEVIEWER_APP_NAME), _L("Show about dialog"), [](wxCommandEvent&) { Slic3r::GUI::about(); }); helpMenu->AppendSeparator(); + } append_menu_item(helpMenu, wxID_ANY, _L("Keyboard Shortcuts") + sep + "&?", _L("Show the list of the keyboard shortcuts"), [](wxCommandEvent&) { wxGetApp().keyboard_shortcuts(); }); #if ENABLE_THUMBNAIL_GENERATOR_DEBUG