3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
be60f0a53c
PrusaSlicer-NonPlainar/src/slic3r/GUI/AboutDialog.cpp

163 lines
6.1 KiB
C++
Raw Normal View History

Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
#include "AboutDialog.hpp"
Removed some obsolete Perl bindings. Removed libslic3r from the default include paths for all modules but libslic3r. Now headers from libslic3r need to be included with an explicit path (libslic3r/libslic3r.h etc) Split the localization macros into I18N.{cpp,h}
2018-11-26 13:41:58 +00:00
#include "I18N.hpp"
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
Removed some obsolete Perl bindings. Removed libslic3r from the default include paths for all modules but libslic3r. Now headers from libslic3r need to be included with an explicit path (libslic3r/libslic3r.h etc) Split the localization macros into I18N.{cpp,h}
2018-11-26 13:41:58 +00:00
#include "libslic3r/Utils.hpp"
Fixed scaling of the controls and InfoDialogs (Sys and About)
2019-02-06 08:49:32 +00:00
#include "GUI_App.hpp"
Added scaling for more some dialogs + Set size for mode buttons
2019-02-11 13:14:35 +00:00
#include "wxExtensions.hpp"
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
namespace Slic3r {
namespace GUI {
AboutDialogLogo::AboutDialogLogo(wxWindow* parent)
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
{
this->SetBackgroundColour(*wxWHITE);
this->logo = wxBitmap(from_u8(Slic3r::var("Slic3r_192px.png")), wxBITMAP_TYPE_PNG);
this->SetMinSize(this->logo.GetSize());
this->Bind(wxEVT_PAINT, &AboutDialogLogo::onRepaint, this);
}
void AboutDialogLogo::onRepaint(wxEvent &event)
{
wxPaintDC dc(this);
dc.SetBackgroundMode(wxTRANSPARENT);
wxSize size = this->GetSize();
int logo_w = this->logo.GetWidth();
int logo_h = this->logo.GetHeight();
dc.DrawBitmap(this->logo, (size.GetWidth() - logo_w)/2, (size.GetHeight() - logo_h)/2, true);
event.Skip();
}
AboutDialog::AboutDialog()
Merge remote-tracking branch 'origin/ys_bug_fixing' into ys_msw_dpi
2019-04-18 13:22:10 +00:00
: DPIDialog(NULL, wxID_ANY, wxString::Format(_(L("About %s")), SLIC3R_APP_NAME), wxDefaultPosition,
Overrided on_dpi_changed() for some Dialogs: AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog + set correct fonts for KBShortcutsDialog
2019-04-18 13:05:17 +00:00
wxDefaultSize, /*wxCAPTION*/wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
{
Overrided on_dpi_changed() for some Dialogs: AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog + set correct fonts for KBShortcutsDialog
2019-04-18 13:05:17 +00:00
SetFont(wxGetApp().normal_font());
Modification of the AboutDialog to be correct showing on dark theme of Linux
2018-05-16 11:56:03 +00:00
wxColour bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
SetBackgroundColour(bgr_clr);
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
wxBoxSizer* hsizer = new wxBoxSizer(wxHORIZONTAL);
Modification of the AboutDialog to be correct showing on dark theme of Linux
2018-05-16 11:56:03 +00:00
auto main_sizer = new wxBoxSizer(wxVERTICAL);
main_sizer->Add(hsizer, 0, wxEXPAND | wxALL, 20);
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
// logo
Overrided on_dpi_changed() for some Dialogs: AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog + set correct fonts for KBShortcutsDialog
2019-04-18 13:05:17 +00:00
m_logo_bitmap = PrusaBitmap(this, "Slic3r_192px.png", 192);
m_logo = new wxStaticBitmap(this, wxID_ANY, m_logo_bitmap.bmp());
// auto *logo = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap(this, "Slic3r_192px.png", 192));
hsizer->Add(m_logo, 1, wxALIGN_CENTER_VERTICAL);
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
Added scaling for more some dialogs + Set size for mode buttons
2019-02-11 13:14:35 +00:00
wxBoxSizer* vsizer = new wxBoxSizer(wxVERTICAL);
hsizer->Add(vsizer, 2, wxEXPAND|wxLEFT, 20);
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
// title
{
Harmonized the application naming.
2019-04-15 14:14:19 +00:00
wxStaticText* title = new wxStaticText(this, wxID_ANY, SLIC3R_APP_NAME, wxDefaultPosition, wxDefaultSize);
Overrided on_dpi_changed() for some Dialogs: AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog + set correct fonts for KBShortcutsDialog
2019-04-18 13:05:17 +00:00
wxFont title_font = GUI::wxGetApp().bold_font();// wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
// title_font.SetWeight(wxFONTWEIGHT_BOLD);
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
title_font.SetFamily(wxFONTFAMILY_ROMAN);
title_font.SetPointSize(24);
title->SetFont(title_font);
Modification of the AboutDialog to be correct showing on dark theme of Linux
2018-05-16 11:56:03 +00:00
vsizer->Add(title, 0, wxALIGN_LEFT | wxTOP, 10);
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
}
// version
{
Preparations to the localization update & new Slic3rPE.pot
2018-05-02 11:20:36 +00:00
auto version_string = _(L("Version"))+ " " + std::string(SLIC3R_VERSION);
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
wxStaticText* version = new wxStaticText(this, wxID_ANY, version_string.c_str(), wxDefaultPosition, wxDefaultSize);
Overrided on_dpi_changed() for some Dialogs: AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog + set correct fonts for KBShortcutsDialog
2019-04-18 13:05:17 +00:00
wxFont version_font = GetFont();//wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
#ifdef __WXMSW__
Overrided on_dpi_changed() for some Dialogs: AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog + set correct fonts for KBShortcutsDialog
2019-04-18 13:05:17 +00:00
version_font.SetPointSize(/*9*/version_font.GetPointSize()-1);
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
#else
version_font.SetPointSize(11);
#endif
version->SetFont(version_font);
vsizer->Add(version, 0, wxALIGN_LEFT | wxBOTTOM, 10);
}
// text
Overrided on_dpi_changed() for some Dialogs: AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog + set correct fonts for KBShortcutsDialog
2019-04-18 13:05:17 +00:00
m_html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO/*NEVER*/);
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
{
Overrided on_dpi_changed() for some Dialogs: AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog + set correct fonts for KBShortcutsDialog
2019-04-18 13:05:17 +00:00
m_html->SetMinSize(wxSize(-1, 16 * wxGetApp().em_unit()));
wxFont font = GetFont();//GUI::wxGetApp().normal_font(); // wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
Modification of the AboutDialog to be correct showing on dark theme of Linux
2018-05-16 11:56:03 +00:00
const auto text_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
auto text_clr_str = wxString::Format(wxT("#%02X%02X%02X"), text_clr.Red(), text_clr.Green(), text_clr.Blue());
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};
Overrided on_dpi_changed() for some Dialogs: AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog + set correct fonts for KBShortcutsDialog
2019-04-18 13:05:17 +00:00
m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
m_html->SetBorders(2);
Modification of the AboutDialog to be correct showing on dark theme of Linux
2018-05-16 11:56:03 +00:00
const auto text = wxString::Format(
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
"<html>"
Modification of the AboutDialog to be correct showing on dark theme of Linux
2018-05-16 11:56:03 +00:00
"<body bgcolor= %s link= %s>"
"<font color=%s>"
Bumped up the year in About Dialog.
2019-03-04 14:34:22 +00:00
"Copyright &copy; 2016-2019 Prusa Research. <br />"
"Copyright &copy; 2011-2018 Alessandro Ranellucci. <br />"
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
"<a href=\"http://slic3r.org/\">Slic3r</a> is licensed under the "
"<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\">GNU Affero General Public License, version 3</a>."
Modification of the AboutDialog to be correct showing on dark theme of Linux
2018-05-16 11:56:03 +00:00
"<br /><br />"
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
"Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik and numerous others. "
"Manual by Gary Hodgson. Inspired by the RepRap community. <br />"
"Slic3r logo designed by Corey Daniels, <a href=\"http://www.famfamfam.com/lab/icons/silk/\">Silk Icon Set</a> designed by Mark James. "
"</font>"
"</body>"
Modification of the AboutDialog to be correct showing on dark theme of Linux
2018-05-16 11:56:03 +00:00
"</html>", bgr_clr_str, text_clr_str, text_clr_str);
Overrided on_dpi_changed() for some Dialogs: AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog + set correct fonts for KBShortcutsDialog
2019-04-18 13:05:17 +00:00
m_html->SetPage(text);
vsizer->Add(m_html, 1, wxEXPAND | wxBOTTOM, 10);
m_html->Bind(wxEVT_HTML_LINK_CLICKED, &AboutDialog::onLinkClicked, this);
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
}
wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxCLOSE);
this->SetEscapeId(wxID_CLOSE);
this->Bind(wxEVT_BUTTON, &AboutDialog::onCloseDialog, this, wxID_CLOSE);
vsizer->Add(buttons, 0, wxEXPAND | wxRIGHT | wxBOTTOM, 3);
Fix of #1606 + Added dialog closing by "Esc" button for the FirmwareDialog.
2019-01-15 09:24:58 +00:00
// this->Bind(wxEVT_LEFT_DOWN, &AboutDialog::onCloseDialog, this);
Fix of SPE-765 Suppress the dialog closing by clicking on a logo.
2019-01-21 14:40:41 +00:00
// logo->Bind(wxEVT_LEFT_DOWN, &AboutDialog::onCloseDialog, this);
Modification of the AboutDialog to be correct showing on dark theme of Linux
2018-05-16 11:56:03 +00:00
SetSizer(main_sizer);
main_sizer->SetSizeHints(this);
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
}
Overrided on_dpi_changed() for some Dialogs: AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog + set correct fonts for KBShortcutsDialog
2019-04-18 13:05:17 +00:00
void AboutDialog::on_dpi_changed(const wxRect &suggested_rect)
{
m_logo_bitmap.rescale();
m_logo->SetBitmap(m_logo_bitmap.bmp());
const wxFont& font = GetFont();
const int fs = font.GetPointSize() - 1;
int font_size[] = { fs, fs, fs, fs, fs, fs, fs };
m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), font_size);
const int& em = em_unit();
m_html->SetMinSize(wxSize(-1, 16 * em));
m_html->Refresh();
const wxSize& size = wxSize(65 * em, 30 * em);
SetMinSize(size);
SetSize(size);
Refresh();
}
Ported the AboutDialog to C++, thanks @alexrj for the work. New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 15:03:37 +00:00
void AboutDialog::onLinkClicked(wxHtmlLinkEvent &event)
{
wxLaunchDefaultBrowser(event.GetLinkInfo().GetHref());
event.Skip(false);
}
void AboutDialog::onCloseDialog(wxEvent &)
{
this->EndModal(wxID_CLOSE);
this->Close();
}
} // namespace GUI
} // namespace Slic3r
Reference in New Issue Copy Permalink