diff options
| author | YuSanka <yusanka@gmail.com> | 2019-04-18 16:22:10 +0300 |
|---|---|---|
| committer | YuSanka <yusanka@gmail.com> | 2019-04-18 16:24:50 +0300 |
| commit | de55801e313fad0ec624f7bcfd5d9d9e1842dcd8 (patch) | |
| tree | c6fb032bd236944e226f760a7089f27c54f42d73 /src/slic3r/GUI/SysInfoDialog.cpp | |
| parent | 9cd3c594be10a92aa943f361c1b63c9a782ac5be (diff) | |
| parent | 850eb86360a757eef44c5483caecb61a4c59b140 (diff) | |
Merge remote-tracking branch 'origin/ys_bug_fixing' into ys_msw_dpi
Diffstat (limited to 'src/slic3r/GUI/SysInfoDialog.cpp')
| -rw-r--r-- | src/slic3r/GUI/SysInfoDialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/slic3r/GUI/SysInfoDialog.cpp b/src/slic3r/GUI/SysInfoDialog.cpp index 0067e6438..471ba5486 100644 --- a/src/slic3r/GUI/SysInfoDialog.cpp +++ b/src/slic3r/GUI/SysInfoDialog.cpp @@ -22,7 +22,7 @@ std::string get_main_info(bool format_as_html) std::string line_end = format_as_html ? "<br>" : "\n"; if (!format_as_html) - out << b_start << SLIC3R_FORK_NAME << b_end << line_end; + out << b_start << SLIC3R_APP_NAME << b_end << line_end; out << b_start << "Version: " << b_end << SLIC3R_VERSION << line_end; out << b_start << "Build: " << b_end << SLIC3R_BUILD << line_end; out << line_end; @@ -41,7 +41,7 @@ std::string get_main_info(bool format_as_html) } SysInfoDialog::SysInfoDialog() - : DPIDialog(NULL, wxID_ANY, _(L("Slic3r Prusa Edition - System Information")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) + : DPIDialog(NULL, wxID_ANY, wxString(SLIC3R_APP_NAME) + " - " + _(L("System Information")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) { wxColour bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); SetBackgroundColour(bgr_clr); @@ -64,7 +64,7 @@ SysInfoDialog::SysInfoDialog() // title { - wxStaticText* title = new wxStaticText(this, wxID_ANY, SLIC3R_FORK_NAME, wxDefaultPosition, wxDefaultSize); + wxStaticText* title = new wxStaticText(this, wxID_ANY, SLIC3R_APP_NAME, wxDefaultPosition, wxDefaultSize); wxFont title_font = wxGetApp().bold_font();//wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); // title_font.SetWeight(wxFONTWEIGHT_BOLD); title_font.SetFamily(wxFONTFAMILY_ROMAN); |