From 016b5e35b6391e9463bcb99a1126908654129b6e Mon Sep 17 00:00:00 2001 From: YuSanka Date: Thu, 28 Mar 2019 10:54:56 +0100 Subject: [PATCH] Some _cosmetic_ fixes : + Set wxDEFAULT_DIALOG_STYLE for MsgDialog + Changed Msg text before language changing --- src/slic3r/GUI/GUI_App.cpp | 16 ++++++---------- src/slic3r/GUI/MsgDialog.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 177f924c7..bdfd2fc26 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -649,20 +649,16 @@ void GUI_App::add_config_menu(wxMenuBar *menu) } case ConfigMenuLanguage: { - /* Before change application language, let's check unsaved changes + /* Before change application language, let's check unsaved changes on 3D-Scene * and draw user's attention to the application restarting after a language change */ wxMessageDialog dialog(nullptr, - _(L("Application will be restarted after language change, " - "and 3D-Scene will be cleaned.")) + "\n" + - _(L("Please, check your changes before.")) + "\n\n" + - _(L("Continue anyway?")), + _(L("Application will be restarted after language change.")) + "\n" + + _(L("3D-Scene will be cleaned.")) + "\n\n" + + _(L("Please, check your changes before.")), _(L("Attention!")), - wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT); - if ( dialog.ShowModal() != wxID_YES) - return; - - if (!wxGetApp().check_unsaved_changes()) + wxICON_QUESTION | wxOK | wxCANCEL); + if ( dialog.ShowModal() == wxID_CANCEL) return; wxArrayString names; diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index 961888455..cc2b9c842 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -28,7 +28,7 @@ MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &he {} MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &headline, wxBitmap bitmap, wxWindowID button_id) : - wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxRESIZE_BORDER), +wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER), boldfont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)), content_sizer(new wxBoxSizer(wxVERTICAL)), btn_sizer(new wxBoxSizer(wxHORIZONTAL)) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index fa4587ca6..6db5a5d5b 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -427,7 +427,7 @@ FreqChangedParams::FreqChangedParams(wxWindow* parent, const int label_width) : option = m_og->get_option("fill_density"); option.opt.label = L("Infill"); - option.opt.width = 5 * wxGetApp().em_unit(); + option.opt.width = 6 * wxGetApp().em_unit(); option.opt.sidetext = " "; line.append_option(option);