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

179 lines
6.3 KiB
C++
Raw Normal View History

Ported System Info Dialog
2018-10-25 10:48:19 +00:00
#include "SysInfoDialog.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"
#include "3DScene.hpp"
#include "GUI.hpp"
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
SLA auto supports: Work with support force deficit to sprinkle support points. Use OpenGL emissive material to render support points.
2019-02-19 09:09:41 +00:00
#include <string>
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
#include <wx/clipbrd.h>
#include <wx/platinfo.h>
Fixed "hard_code" setting of the size for the Sidebar and Tabs + Fixed assert after config_wizard changing
2019-02-04 09:35:16 +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 System Info Dialog
2018-10-25 10:48:19 +00:00
namespace Slic3r {
namespace GUI {
std::string get_main_info(bool format_as_html)
{
std::stringstream out;
std::string b_start = format_as_html ? "<b>" : "";
std::string b_end = format_as_html ? "</b>" : "";
std::string line_end = format_as_html ? "<br>" : "\n";
if (!format_as_html)
Harmonized the application naming.
2019-04-15 14:14:19 +00:00
out << b_start << SLIC3R_APP_NAME << b_end << line_end;
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
out << b_start << "Version: " << b_end << SLIC3R_VERSION << line_end;
Updated handling of the SLIC3R_BUILD_ID key
2019-05-13 16:01:00 +00:00
out << b_start << "Build: " << b_end << SLIC3R_BUILD_ID << line_end;
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
out << line_end;
out << b_start << "Operating System: " << b_end << wxPlatformInfo::Get().GetOperatingSystemFamilyName() << line_end;
out << b_start << "System Architecture: " << b_end << wxPlatformInfo::Get().GetArchName() << line_end;
out << b_start <<
#if defined _WIN32
"Windows Version: "
#else
// Hopefully some kind of unix / linux.
"System Version: "
#endif
<< b_end << wxPlatformInfo::Get().GetOperatingSystemDescription() << line_end;
return out.str();
}
SysInfoDialog::SysInfoDialog()
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(SLIC3R_APP_NAME) + " - " + _(L("System Information")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
{
wxColour bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
SetBackgroundColour(bgr_clr);
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());
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
wxBoxSizer* hsizer = new wxBoxSizer(wxHORIZONTAL);
Fixed scaling of the controls and InfoDialogs (Sys and About)
2019-02-06 08:49:32 +00:00
hsizer->SetMinSize(wxSize(50 * wxGetApp().em_unit(), -1));
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
auto main_sizer = new wxBoxSizer(wxVERTICAL);
Fixed scale of the PrusaDoubleSlider and typo in SysInfoDialog
2019-02-06 11:04:17 +00:00
main_sizer->Add(hsizer, 1, wxEXPAND | wxALL, 10);
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
// logo
WIP: Renaming to PrusaSlicer. Removed the obsolte icons.
2019-05-13 10:13:28 +00:00
m_logo_bmp = ScalableBitmap(this, "PrusaSlicer_192px.png", 192);
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 = new wxStaticBitmap(this, wxID_ANY, m_logo_bmp.bmp());
hsizer->Add(m_logo, 0, wxALIGN_CENTER_VERTICAL);
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
wxBoxSizer* vsizer = new wxBoxSizer(wxVERTICAL);
hsizer->Add(vsizer, 1, wxEXPAND|wxLEFT, 20);
// 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);
Big Refactoring: - deleted/renamed all _Prusa_ prefixes, - cleaned code from commented parts - rescale() -> msw_rescale()
2019-04-24 23:45:00 +00:00
wxFont title_font = wxGetApp().bold_font();
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
title_font.SetFamily(wxFONTFAMILY_ROMAN);
System Dialog - use bigger image, as the smaller one is not contained in our Windows binary distro. Fixed typo in "Add support bloker"
2018-12-05 15:24:43 +00:00
title_font.SetPointSize(22);
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
title->SetFont(title_font);
Fixed scaling of the controls and InfoDialogs (Sys and About)
2019-02-06 08:49:32 +00:00
vsizer->Add(title, 0, wxEXPAND | wxALIGN_LEFT | wxTOP, wxGetApp().em_unit()/*50*/);
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
}
// main_info_text
Big Refactoring: - deleted/renamed all _Prusa_ prefixes, - cleaned code from commented parts - rescale() -> msw_rescale()
2019-04-24 23:45:00 +00:00
wxFont font = wxGetApp().normal_font();
Ported System Info Dialog
2018-10-25 10:48:19 +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;
Fixed OsX build fails
2018-10-25 13:59:27 +00:00
int size[] = { static_cast<int>(fs*1.5), static_cast<int>(fs*1.4), static_cast<int>(fs*1.3), fs, fs, fs, fs };
Ported System Info Dialog
2018-10-25 10:48:19 +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 = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_NEVER);
Ported System Info Dialog
2018-10-25 10:48:19 +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->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
m_html->SetBorders(2);
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
const auto text = wxString::Format(
"<html>"
"<body bgcolor= %s link= %s>"
"<font color=%s>"
"%s"
"</font>"
"</body>"
"</html>", bgr_clr_str, text_clr_str, text_clr_str,
get_main_info(true));
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, wxGetApp().em_unit());
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
}
// opengl_info
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_opengl_info_html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
Ported System Info Dialog
2018-10-25 10:48:19 +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_opengl_info_html->SetMinSize(wxSize(-1, 16 * wxGetApp().em_unit()));
m_opengl_info_html->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
m_opengl_info_html->SetBorders(10);
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
const auto text = wxString::Format(
"<html>"
"<body bgcolor= %s link= %s>"
"<font color=%s>"
"%s"
"</font>"
"</body>"
"</html>", bgr_clr_str, text_clr_str, text_clr_str,
_3DScene::get_gl_info(true, true));
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_opengl_info_html->SetPage(text);
main_sizer->Add(m_opengl_info_html, 1, wxEXPAND | wxBOTTOM, 15);
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
}
wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxOK);
Fix of New assertion failure with 2.0.0rc #2250 Calls to Dialog::Close() after Dialog::EndModal() were removed.
2019-05-16 14:06:57 +00:00
m_btn_copy_to_clipboard = new wxButton(this, wxID_ANY, _(L("Copy to Clipboard")), wxDefaultPosition, wxDefaultSize);
Added msw_buttons_rescale() - Function for a scaling Dialog's buttons under MSW
2019-04-25 13:06:44 +00:00
buttons->Insert(0, m_btn_copy_to_clipboard, 0, wxLEFT, 5);
m_btn_copy_to_clipboard->Bind(wxEVT_BUTTON, &SysInfoDialog::onCopyToClipboard, this);
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
Upgraded "Keyboard shortcuts" dialog
2018-12-20 11:52:16 +00:00
this->SetEscapeId(wxID_OK);
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
this->Bind(wxEVT_BUTTON, &SysInfoDialog::onCloseDialog, this, wxID_OK);
main_sizer->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, &SysInfoDialog::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, &SysInfoDialog::onCloseDialog, this);
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
SetSizer(main_sizer);
main_sizer->SetSizeHints(this);
}
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 SysInfoDialog::on_dpi_changed(const wxRect &suggested_rect)
{
Big Refactoring: - deleted/renamed all _Prusa_ prefixes, - cleaned code from commented parts - rescale() -> msw_rescale()
2019-04-24 23:45:00 +00:00
m_logo_bmp.msw_rescale();
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->SetBitmap(m_logo_bmp.bmp());
wxFont font = GetFont();
const int fs = font.GetPointSize() - 1;
int font_size[] = { static_cast<int>(fs*1.5), static_cast<int>(fs*1.4), static_cast<int>(fs*1.3), fs, fs, fs, fs };
m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), font_size);
m_html->Refresh();
const int& em = em_unit();
Added msw_buttons_rescale() - Function for a scaling Dialog's buttons under MSW
2019-04-25 13:06:44 +00:00
msw_buttons_rescale(this, em, { wxID_OK, m_btn_copy_to_clipboard->GetId() });
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_opengl_info_html->SetMinSize(wxSize(-1, 16 * em));
m_opengl_info_html->SetFonts(font.GetFaceName(), font.GetFaceName(), font_size);
m_opengl_info_html->Refresh();
const wxSize& size = wxSize(65 * em, 55 * em);
SetMinSize(size);
Added msw_buttons_rescale() - Function for a scaling Dialog's buttons under MSW
2019-04-25 13:06:44 +00:00
Fit();
Overrided on_dpi_changed() for some Dialogs: AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog + set correct fonts for KBShortcutsDialog
2019-04-18 13:05:17 +00:00
Refresh();
}
Ported System Info Dialog
2018-10-25 10:48:19 +00:00
void SysInfoDialog::onCopyToClipboard(wxEvent &)
{
wxTheClipboard->Open();
const auto text = get_main_info(false)+"\n"+_3DScene::get_gl_info(false, true);
wxTheClipboard->SetData(new wxTextDataObject(text));
wxTheClipboard->Close();
}
void SysInfoDialog::onCloseDialog(wxEvent &)
{
this->EndModal(wxID_CLOSE);
}
} // namespace GUI
} // namespace Slic3r
Reference in New Issue Copy Permalink