diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index 45921b530..caeb8da03 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -231,6 +231,7 @@ void show_error(wxWindow* parent, const wxString& message) void show_error(wxWindow* parent, const char* message) { + assert(message); show_error(parent, wxString::FromUTF8(message)); } @@ -242,10 +243,16 @@ void show_error_id(int id, const std::string& message) void show_info(wxWindow* parent, const wxString& message, const wxString& title) { - wxMessageDialog msg_wingow(parent, message, title.empty() ? _(L("Notice")) : title, wxOK | wxICON_INFORMATION); + wxMessageDialog msg_wingow(parent, message, wxString(SLIC3R_APP_NAME " - ") + (title.empty() ? _(L("Notice")) : title), wxOK | wxICON_INFORMATION); msg_wingow.ShowModal(); } +void show_info(wxWindow* parent, const char* message, const char* title) +{ + assert(message); + show_info(parent, wxString::FromUTF8(message), title ? wxString::FromUTF8(title) : wxString()); +} + void warning_catcher(wxWindow* parent, const wxString& message) { wxMessageDialog msg(parent, message, _(L("Warning")), wxOK | wxICON_WARNING); diff --git a/src/slic3r/GUI/GUI.hpp b/src/slic3r/GUI/GUI.hpp index b13e7c042..2bfddf718 100644 --- a/src/slic3r/GUI/GUI.hpp +++ b/src/slic3r/GUI/GUI.hpp @@ -42,7 +42,9 @@ void show_error(wxWindow* parent, const wxString& message); void show_error(wxWindow* parent, const char* message); inline void show_error(wxWindow* parent, const std::string& message) { show_error(parent, message.c_str()); } void show_error_id(int id, const std::string& message); // For Perl -void show_info(wxWindow* parent, const wxString& message, const wxString& title); +void show_info(wxWindow* parent, const wxString& message, const wxString& title = wxString()); +void show_info(wxWindow* parent, const char* message, const char* title = nullptr); +inline void show_info(wxWindow* parent, const std::string& message,const std::string& title = std::string()) { show_info(parent, message.c_str(), title.c_str()); } void warning_catcher(wxWindow* parent, const wxString& message); // Creates a wxCheckListBoxComboPopup inside the given wxComboCtrl, filled with the given text and items. diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 1e13bf3af..0ebad64d1 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -5199,11 +5199,10 @@ void Plater::drive_ejected_callback() if (RemovableDriveManager::get_instance().get_did_eject()) { RemovableDriveManager::get_instance().set_did_eject(false); - wxString message = wxString::Format( - _(L("Unmounting successful. The device %s(%s) can now be safely removed from the computer.")), - RemovableDriveManager::get_instance().get_ejected_name(), - RemovableDriveManager::get_instance().get_ejected_path()); - wxMessageBox(message); + show_info(this, + (boost::format(_utf8(L("Unmounting successful. The device %s(%s) can now be safely removed from the computer."))) + % RemovableDriveManager::get_instance().get_ejected_name() + % RemovableDriveManager::get_instance().get_ejected_path()).str()); } p->show_action_buttons(false); }