3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed localization issue of the "Removable media unmounted" message.

Browse Source 
Generalized the Slic3r::show_info() function to std::strings and
const char*
This commit is contained in:
bubnikv 2020-02-29 12:03:07 +01:00
parent 192bdffb3f
commit c9a75bb70a
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/GUI.cpp
View File

@ -231,6 +231,7 @@ void show_error(wxWindow* parent, const wxString& message)
void show_error(wxWindow* parent, const char* message) void show_error(wxWindow* parent, const char* message)
{ {
assert(message);
show_error(parent, wxString::FromUTF8(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) 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(); 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) void warning_catcher(wxWindow* parent, const wxString& message)
{ {
wxMessageDialog msg(parent, message, _(L("Warning")), wxOK | wxICON_WARNING); wxMessageDialog msg(parent, message, _(L("Warning")), wxOK | wxICON_WARNING);

4
src/slic3r/GUI/GUI.hpp
View File

@ -42,7 +42,9 @@ void show_error(wxWindow* parent, const wxString& message);
void show_error(wxWindow* parent, const char* 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()); } 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_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); void warning_catcher(wxWindow* parent, const wxString& message);
// Creates a wxCheckListBoxComboPopup inside the given wxComboCtrl, filled with the given text and items. // Creates a wxCheckListBoxComboPopup inside the given wxComboCtrl, filled with the given text and items.

9
src/slic3r/GUI/Plater.cpp
View File

@ -5199,11 +5199,10 @@ void Plater::drive_ejected_callback()
if (RemovableDriveManager::get_instance().get_did_eject()) if (RemovableDriveManager::get_instance().get_did_eject())
{ {
RemovableDriveManager::get_instance().set_did_eject(false); RemovableDriveManager::get_instance().set_did_eject(false);
wxString message = wxString::Format( show_info(this,
_(L("Unmounting successful. The device %s(%s) can now be safely removed from the computer.")), (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_name()
RemovableDriveManager::get_instance().get_ejected_path()); % RemovableDriveManager::get_instance().get_ejected_path()).str());
wxMessageBox(message);
} }
p->show_action_buttons(false); p->show_action_buttons(false);
} }